Changeset 36182

Timestamp:

01/06/2016 07:52:53 AM (9 years ago)

Author:

dd32

Message:

Updates: Don't perform an API call to WordPress.org for every plugin update displayed. The API has been updated to return this information with the update response.

See #35301

Location:

trunk/src

Files:

• wp-admin/update-core.php (modified) (2 diffs)
• wp-includes/update.php (modified) (1 diff)

trunk/src/wp-admin/update-core.php

@@ -254 +254 @@
 <?php
     foreach ( (array) $plugins as $plugin_file => $plugin_data ) {
-        $info = plugins_api( 'plugin_information', array(
-            'slug' => $plugin_data->update->slug,
-            'fields' => array(
-                'short_description' => false,
-                'sections' => false,
-                'requires' => false,
-                'rating' => false,
-                'ratings' => false,
-                'downloaded' => false,
-                'downloadlink' => false,
-                'last_updated' => false,
-                'added' => false,
-                'tags' => false,
-                'homepage' => false,
-                'donate_link' => false,
-            ),
-        ) );
-
-        if ( is_wp_error( $info ) ) {
-            $info = false;
-        }
-
         // Get plugin compat for running version of WordPress.
-        if ( isset($info->tested) && version_compare($info->tested, $cur_wp_version, '>=') ) {
+        if ( isset($plugin_data->update->tested) && version_compare($plugin_data->update->tested, $cur_wp_version, '>=') ) {
             $compat = '<br />' . sprintf(__('Compatibility with WordPress %1$s: 100%% (according to its author)'), $cur_wp_version);
-        } elseif ( isset($info->compatibility[$cur_wp_version][$plugin_data->update->new_version]) ) {
-            $compat = $info->compatibility[$cur_wp_version][$plugin_data->update->new_version];
-            $compat = '<br />' . sprintf(__('Compatibility with WordPress %1$s: %2$d%% (%3$d "works" votes out of %4$d total)'), $cur_wp_version, $compat[0], $compat[2], $compat[1]);
+        } elseif ( isset($plugin_data->update->compatibility->{$cur_wp_version}) ) {
+            $compat = $plugin_data->update->compatibility->{$cur_wp_version};
+            $compat = '<br />' . sprintf(__('Compatibility with WordPress %1$s: %2$d%% (%3$d "works" votes out of %4$d total)'), $cur_wp_version, $compat->percent, $compat->votes, $compat->total_votes);
         } else {
             $compat = '<br />' . sprintf(__('Compatibility with WordPress %1$s: Unknown'), $cur_wp_version);
@@ -287 +265 @@
         // Get plugin compat for updated version of WordPress.
         if ( $core_update_version ) {
-            if ( isset( $info->tested ) && version_compare( $info->tested, $core_update_version, '>=' ) ) {
+            if ( isset( $plugin_data->update->tested ) && version_compare( $plugin_data->update->tested, $core_update_version, '>=' ) ) {
                 $compat .= '<br />' . sprintf( __( 'Compatibility with WordPress %1$s: 100%% (according to its author)' ), $core_update_version );
-            } elseif ( isset( $info->compatibility[ $core_update_version ][ $plugin_data->update->new_version ] ) ) {
-                $update_compat = $info->compatibility[$core_update_version][$plugin_data->update->new_version];
-                $compat .= '<br />' . sprintf(__('Compatibility with WordPress %1$s: %2$d%% (%3$d "works" votes out of %4$d total)'), $core_update_version, $update_compat[0], $update_compat[2], $update_compat[1]);
+            } elseif ( isset( $plugin_data->update->compatibility->{$core_update_version} ) ) {
+                $update_compat = $plugin_data->update->compatibility->{$core_update_version};
+                $compat .= '<br />' . sprintf(__('Compatibility with WordPress %1$s: %2$d%% (%3$d "works" votes out of %4$d total)'), $core_update_version, $update_compat->percent, $update_compat->votes, $update_compat->total_votes);
             } else {
                 $compat .= '<br />' . sprintf(__('Compatibility with WordPress %1$s: Unknown'), $core_update_version);

trunk/src/wp-includes/update.php

@@ -311 +311 @@
     foreach ( $response['plugins'] as &$plugin ) {
         $plugin = (object) $plugin;
-    }
-    unset( $plugin );
+        if ( isset( $plugin->compatibility ) ) {
+            $plugin->compatibility = (object) $plugin->compatibility;
+            foreach ( $plugin->compatibility as &$data ) {
+                $data = (object) $data;
+            }
+        }
+    }
+    unset( $plugin, $data );
     foreach ( $response['no_update'] as &$plugin ) {
         $plugin = (object) $plugin;