Ticket #32198: 32198.diff

src/wp-admin/includes/ajax-actions.php

@@ -2958 +2958 @@
         $plugin_data = get_plugin_data( WP_PLUGIN_DIR . '/' . $plugin );
         if ( $plugin_data['Version'] ) {
                 $status['oldVersion'] = sprintf( __( 'Version %s' ), $plugin_data['Version'] );
         }
 
         if ( ! current_user_can( 'update_plugins' ) ) {
                 $status['error'] = __( 'You do not have sufficient permissions to update plugins on this site.' );
                 wp_send_json_error( $status );
         }
 
         check_ajax_referer( 'updates' );
 
         include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
 
         $current = get_site_transient( 'update_plugins' );
-        if ( empty( $current ) ) {
+        if ( empty( $current ) || empty( $current->response ) ) {
                 wp_update_plugins();
         }
 
         $skin = new Automatic_Upgrader_Skin();
         $upgrader = new Plugin_Upgrader( $skin );
         $result = $upgrader->bulk_upgrade( array( $plugin ) );
 
         if ( is_array( $result ) && empty( $result[$plugin] ) && is_wp_error( $skin->result ) ) {
                 $result = $skin->result;
         }
 
         if ( is_array( $result ) && !empty( $result[ $plugin ] ) ) {
                 $plugin_update_data = current( $result );
 
                 /*

src/wp-includes/update.php

@@ -259 +259 @@
         // Update last_checked for current to prevent multiple blocking requests if request hangs
         $current->last_checked = time();
         set_site_transient( 'update_plugins', $current );
 
         $to_send = compact( 'plugins', 'active' );
 
         /**
          * Filter the locales requested for plugin translations.
          *
          * @since 3.7.0
          *
          * @param array $locales Plugin locale. Default is current locale of the site.
          */
         $locales = apply_filters( 'plugins_update_check_locales', array( get_locale() ) );
 
-        if ( defined( 'DOING_CRON' ) && DOING_CRON ) {
+        if ( ( defined( 'DOING_CRON' ) && DOING_CRON ) || ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
                 $timeout = 30;
         } else {
                 // Three seconds, plus one extra second for every 10 plugins
                 $timeout = 3 + (int) ( count( $plugins ) / 10 );
         }
 
         $options = array(
                 'timeout' => $timeout,
                 'body' => array(
                         'plugins'      => wp_json_encode( $to_send ),
                         'translations' => wp_json_encode( $translations ),
                         'locale'       => wp_json_encode( $locales ),
                         'all'          => wp_json_encode( true ),
                 ),
                 'user-agent' => 'WordPress/' . $wp_version . '; ' . get_bloginfo( 'url' )