Ticket #35301: 35301.2.diff

src/wp-admin/update-core.php

@@ -241 +241 @@
 <p><?php _e( 'The following plugins have new versions available. Check the ones you want to update and then click &#8220;Update Plugins&#8221;.' ); ?></p>
 <form method="post" action="<?php echo esc_url( $form_action ); ?>" name="upgrade-plugins" class="upgrade">
 <?php wp_nonce_field('upgrade-core'); ?>
 <p><input id="upgrade-plugins" class="button" type="submit" value="<?php esc_attr_e('Update Plugins'); ?>" name="upgrade" /></p>
 <table class="widefat" id="update-plugins-table">
         <thead>
         <tr>
                 <td scope="col" class="manage-column check-column"><input type="checkbox" id="plugins-select-all" /></td>
                 <th scope="col" class="manage-column"><label for="plugins-select-all"><?php _e('Select All'); ?></label></th>
         </tr>
         </thead>
 
         <tbody class="plugins">
 <?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);
                 }
                 // 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);
                         }
                 }
                 // Get the upgrade notice for the new plugin version.
                 if ( isset($plugin_data->update->upgrade_notice) ) {
                         $upgrade_notice = '<br />' . strip_tags($plugin_data->update->upgrade_notice);
                 } else {
                         $upgrade_notice = '';
                 }
 
                 $details_url = self_admin_url('plugin-install.php?tab=plugin-information&plugin=' . $plugin_data->update->slug . '&section=changelog&TB_iframe=true&width=640&height=662');
                 $details_name = sprintf( '<span class="screen-reader-text">%1$s</span>', esc_attr( $plugin_data->Name ) );
                 /* translators: 1: Plugin name 2: Plugin version */
                 $details_text = sprintf( __( 'View %1$s version %2$s details.' ), $details_name, $plugin_data->update->new_version );

src/wp-includes/update.php

@@ -298 +298 @@
                 $url = set_url_scheme( $url, 'https' );
 
         $raw_response = wp_remote_post( $url, $options );
         if ( $ssl && is_wp_error( $raw_response ) ) {
                 trigger_error( __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.' ) . ' ' . __( '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)' ), headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE );
                 $raw_response = wp_remote_post( $http_url, $options );
         }
 
         if ( is_wp_error( $raw_response ) || 200 != wp_remote_retrieve_response_code( $raw_response ) ) {
                 return;
         }
 
         $response = json_decode( wp_remote_retrieve_body( $raw_response ), true );
         foreach ( $response['plugins'] as &$plugin ) {
                 $plugin = (object) $plugin;
+                if ( $plugin->compatibility ) {
+                        $plugin->compatibility = (object) $plugin->compatibility;
+                        foreach ( $plugin->compatibility as $version => $data ) {
+                                $plugin->compatibility->{$version} = (object) $data;
+                        }
+                }
         }
-        unset( $plugin );
+        unset( $plugin, $_compat, $version, $data );
         foreach ( $response['no_update'] as &$plugin ) {
                 $plugin = (object) $plugin;
         }
         unset( $plugin );
 
         if ( is_array( $response ) ) {
                 $new_option->response = $response['plugins'];
                 $new_option->translations = $response['translations'];
                 // TODO: Perhaps better to store no_update in a separate transient with an expiry?
                 $new_option->no_update = $response['no_update'];
         } else {
                 $new_option->response = array();
                 $new_option->translations = array();
                 $new_option->no_update = array();
         }