diff options
| author |   Theo Chatzimichos <tampakrap@gentoo.org> | 2013-10-03 21:53:38 +0200 |
|---|---|---|
| committer | Theo Chatzimichos <tampakrap@gentoo.org> | 2013-10-03 21:53:38 +0200 |
| commit | 61f7269ffabd11b7de56507c69191be42d7cfa60 (patch) | |
| tree | 2ad81bec8d0c124019b23c841d80882c303801bc /plugins/jetpack/class.jetpack-client-server.php | |
| parent | forgot to include new files of jetpack (diff) | |
| download | blogs-gentoo-61f7269ffabd11b7de56507c69191be42d7cfa60.tar.gz blogs-gentoo-61f7269ffabd11b7de56507c69191be42d7cfa60.tar.bz2 blogs-gentoo-61f7269ffabd11b7de56507c69191be42d7cfa60.zip | |
update jetpack
Diffstat (limited to 'plugins/jetpack/class.jetpack-client-server.php')
| -rw-r--r-- | plugins/jetpack/class.jetpack-client-server.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/jetpack/class.jetpack-client-server.php b/plugins/jetpack/class.jetpack-client-server.php index 1c0fe25e..f02eb0d2 100644 --- a/plugins/jetpack/class.jetpack-client-server.php +++ b/plugins/jetpack/class.jetpack-client-server.php @@ -87,8 +87,8 @@ class Jetpack_Client_Server { break; } - if ( $active_modules = Jetpack::get_option( 'active_modules' ) ) { - Jetpack::delete_option( 'active_modules' ); + if ( $active_modules = Jetpack_Options::get_option( 'active_modules' ) ) { + Jetpack_Options::delete_option( 'active_modules' ); Jetpack::activate_default_modules( 999, 1, $active_modules ); } else { @@ -149,7 +149,7 @@ class Jetpack_Client_Server { $redirect = isset( $data['redirect'] ) ? esc_url_raw( (string) $data['redirect'] ) : ''; $body = array( - 'client_id' => Jetpack::get_option( 'id' ), + 'client_id' => Jetpack_Options::get_option( 'id' ), 'client_secret' => $client_secret->secret, 'grant_type' => 'authorization_code', 'code' => $data['code'], @@ -167,7 +167,7 @@ class Jetpack_Client_Server { 'Accept' => 'application/json', ), ); - $response = Jetpack_Client::_wp_remote_request( Jetpack::fix_url_for_bad_hosts( Jetpack::api_url( 'token' ), $args ), $args ); + $response = Jetpack_Client::_wp_remote_request( Jetpack::fix_url_for_bad_hosts( Jetpack::api_url( 'token' ) ), $args ); if ( is_wp_error( $response ) ) { return new Jetpack_Error( 'token_http_request_failed', $response->get_error_message() ); |