Ticket #17833: 17833.diff

wp-admin/includes/class-wp-upgrader.php

@@ -374 +374 @@
                 $this->strings['no_package'] = __('Update package not available.');
                 $this->strings['downloading_package'] = __('Downloading update from <span class="code">%s</span>&#8230;');
                 $this->strings['unpack_package'] = __('Unpacking the update&#8230;');
-                $this->strings['deactivate_plugin'] = __('Deactivating the plugin&#8230;');
                 $this->strings['remove_old'] = __('Removing the old version of the plugin&#8230;');
                 $this->strings['remove_old_failed'] = __('Could not remove the old plugin.');
                 $this->strings['process_failed'] = __('Plugin update failed.');
@@ -597 +596 @@
                         return new WP_Error('bad_request', $this->strings['bad_request']);
 
                 if ( is_plugin_active($plugin) ) {
-                        $this->skin->feedback('deactivate_plugin');
                         //Deactivate the plugin silently, Prevent deactivation hooks from running.
                         deactivate_plugins($plugin, true);
                 }
@@ -1198 +1196 @@
         function after() {
                 $this->plugin = $this->upgrader->plugin_info();
                 if ( !empty($this->plugin) && !is_wp_error($this->result) && $this->plugin_active ){
-                        show_message(__('Reactivating the plugin&#8230;'));
                         echo '<iframe style="border:0;overflow:hidden" width="100%" height="170px" src="' . wp_nonce_url('update.php?action=activate-plugin&networkwide=' . $this->plugin_network_active . '&plugin=' . $this->plugin, 'activate-plugin_' . $this->plugin) .'"></iframe>';
                 }