← All changes | sal/class.json-api-token.php +11 -7 13.5.2 → 16.3-a.1 View file →

		@@ -4,8 +4,12 @@
4	4	*
5	5	* @package automattic/jetpack
6	6	*/
7	7
	8	+if ( ! defined( 'ABSPATH' ) ) {
	9	+ exit( 0 );
	10	+}
	11	+
8	12	/**
9	13	* Base class for Jetpack_Site, so that we have a real class instead of just passing around an array.
10	14	*/
11	15	class SAL_Token {
		@@ -113,15 +117,15 @@
113	117	*
114	118	* @return SAL_Token
115	119	*/
116	120	public static function from_rest_token( $token ) {
117		- $user_id = isset( $token['user_id'] ) ? $token['user_id'] : get_current_user_id();
118		- $scope = isset( $token['scope'][0] ) ? $token['scope'][0] : null;
119		- $client_id = isset( $token['client_id'] ) ? $token['client_id'] : null;
120		- $external_user_id = isset( $token['external_user_id'] ) ? $token['external_user_id'] : null;
121		- $external_user_code = isset( $token['external_user_code'] ) ? $token['external_user_code'] : null;
122		- $auth = isset( $token['auth'] ) ? $token['auth'] : null;
123		- $blog_id = isset( $token['blog_id'] ) ? $token['blog_id'] : null;
	121	+ $user_id = $token['user_id'] ?? get_current_user_id();
	122	+ $scope = $token['scope'][0] ?? null;
	123	+ $client_id = $token['client_id'] ?? null;
	124	+ $external_user_id = $token['external_user_id'] ?? null;
	125	+ $external_user_code = $token['external_user_code'] ?? null;
	126	+ $auth = $token['auth'] ?? null;
	127	+ $blog_id = $token['blog_id'] ?? null;
124	128
125	129	return new SAL_Token(
126	130	$blog_id,
127	131	$user_id,