← All changes | includes/API/SignUp.php +20 -13 3.6.5 → 3.7.3 View file →

		@@ -72,23 +72,30 @@
72	72	if( is_wp_error( $response ) ) {
73	73	return $response;
74	74	}
75	75
76		- if ( ! Login::is_globally_signed() ) {
77		- Options::set_global_login();
78		- }
	76	+ $options = $this->utils( 'options' );
	77	+ $options->use_current_user( true );
79	78
80		- if ( ! empty( $response['user']['api_key'] ) ) {
81		- $this->utils('options')->set( 'api_key', $response['user']['api_key'] );
82		- unset( $response['user']['api_key'] );
83		- }
	79	+ try {
	80	+ if ( ! Login::is_globally_signed() ) {
	81	+ Options::set_global_login();
	82	+ }
84	83
85		- if ( ! empty( $response['user'] ) && is_array( $response['user'] ) ) {
86		- $response['user']['site_url'] = base64_encode( $_site_url );
87		- $response['user']['ip'] = $_ip;
	84	+ if ( ! empty( $response['user']['api_key'] ) ) {
	85	+ $options->set( 'api_key', $response['user']['api_key'] );
	86	+ unset( $response['user']['api_key'] );
	87	+ }
	88	+
	89	+ if ( ! empty( $response['user'] ) && is_array( $response['user'] ) ) {
	90	+ $response['user']['site_url'] = base64_encode( $_site_url );
	91	+ $response['user']['ip'] = $_ip;
	92	+ }
	93	+
	94	+ $options->set( 'user', $response['user'] );
	95	+ } finally {
	96	+ $options->use_current_user( false );
88	97	}
89	98
90		- $this->utils('options')->set( 'user', $response['user'] );
91		-
92	99	return $response;
93	100	}
94		-}
	101	+}