Changeset 1738590 for jetpack/trunk/class.jetpack.php

Timestamp:

09/29/2017 07:04:55 PM (7 years ago)

Author:

dsmart

Message:

Jetpack 5.4-beta2

​https://github.com/Automattic/jetpack/releases/tag/5.4-beta2

File:

• jetpack/trunk/class.jetpack.php (modified) (9 diffs)

jetpack/trunk/class.jetpack.php

@@ -1655 +1655 @@
      */
     public static function load_modules() {
-        if ( ! self::is_active() && !self::is_development_mode() ) {
-            if ( ! is_multisite() || ! get_site_option( 'jetpack_protect_active' ) ) {
-                return;
-            }
+        if (
+            ! self::is_active()
+            && ! self::is_development_mode()
+            && (
+                ! is_multisite()
+                || ! get_site_option( 'jetpack_protect_active' )
+            )
+        ) {
+            return;
         }
 
@@ -1735 +1740 @@
 
         // Load module-specific code that is needed even when a module isn't active. Loaded here because code contained therein may need actions such as setup_theme.
-        if ( Jetpack::is_active() || Jetpack::is_development_mode() )
-            require_once( JETPACK__PLUGIN_DIR . 'modules/module-extras.php' );
+        require_once( JETPACK__PLUGIN_DIR . 'modules/module-extras.php' );
     }
 
@@ -5253 +5257 @@
                 $jpUser = get_user_by( 'email', $jpo->onboarding->jpUser );
                 if ( is_a( $jpUser, 'WP_User' ) ) {
-                    $token_type = 'user';
-                    $token->external_user_id = $jpUser->ID;
+                    wp_set_current_user( $jpUser->ID );
+                    $user_can = is_multisite()
+                        ? current_user_can_for_blog( get_current_blog_id(), 'manage_options' )
+                        : current_user_can( 'manage_options' );
+                    if ( $user_can ) {
+                        $token_type = 'user';
+                        $token->external_user_id = $jpUser->ID;
+                    }
                 }
             }
@@ -6020 +6030 @@
      * Checks whether the sync_error_idc option is valid or not, and if not, will do cleanup.
      *
+
+
+
      * @return bool
      */
@@ -6043 +6056 @@
         // Is the site opted in and does the stored sync_error_idc option match what we now generate?
         $sync_error = Jetpack_Options::get_option( 'sync_error_idc' );
-        $local_options = self::get_sync_error_idc_option();
         if ( $idc_allowed && $sync_error && self::sync_idc_optin() ) {
+
             if ( $sync_error['home'] === $local_options['home'] && $sync_error['siteurl'] === $local_options['siteurl'] ) {
                 $is_valid = true;
@@ -6092 +6105 @@
      *
      * @since 4.4.0
+
      *
      * @param array $response
@@ -6097 +6111 @@
      */
     public static function get_sync_error_idc_option( $response = array() ) {
-        require_once JETPACK__PLUGIN_DIR . 'sync/class.jetpack-sync-functions.php';
-        $local_options = array(
-            'home'    => Jetpack_Sync_Functions::home_url(),
-            'siteurl' => Jetpack_Sync_Functions::site_url(),
-        );
-
-        $options = array_merge( $local_options, $response );
-
-        $returned_values = array();
-        foreach( $options as $key => $option ) {
-            if ( 'error_code' === $key ) {
-                $returned_values[ $key ] = $option;
-                continue;
-            }
-
-            if ( is_wp_error( $normalized_url = self::normalize_url_protocol_agnostic( $option ) ) ) {
-                continue;
-            }
-
-            $returned_values[ $key ] = $normalized_url;
+        $returned_values = get_transient( 'jetpack_idc_option' );
+        if ( false === $returned_values ) {
+            require_once JETPACK__PLUGIN_DIR . 'sync/class.jetpack-sync-functions.php';
+            $local_options = array(
+                'home'    => Jetpack_Sync_Functions::home_url(),
+                'siteurl' => Jetpack_Sync_Functions::site_url(),
+            );
+
+            $options = array_merge( $local_options, $response );
+
+            $returned_values = array();
+            foreach( $options as $key => $option ) {
+                if ( 'error_code' === $key ) {
+                    $returned_values[ $key ] = $option;
+                    continue;
+                }
+
+                if ( is_wp_error( $normalized_url = self::normalize_url_protocol_agnostic( $option ) ) ) {
+                    continue;
+                }
+
+                $returned_values[ $key ] = $normalized_url;
+            }
+
+            set_transient( 'jetpack_idc_option', $returned_values, MINUTE_IN_SECONDS );
         }
 
@@ -6728 +6747 @@
         if ( self::is_active() ) {
             add_action( 'jetpack_dashboard_widget', array( __CLASS__, 'dashboard_widget_footer' ), 999 );
-            $widget_title = __( 'Site Stats', 'jetpack' );
         }
 
@@ -6734 +6752 @@
             wp_add_dashboard_widget(
                 'jetpack_summary_widget',
-                $widget_title,
+                ,
                 array( __CLASS__, 'dashboard_widget' )
             );