Changeset 12157

Timestamp:

11/09/2009 06:53:21 PM (17 years ago)

Author:

ryan

Message:

Put site into maintenance mode during bulk plugin upgrade. Skip plugin deactivate/activate. Add compatibility info. see #10973

Location:

trunk

Files:

• wp-admin/includes/class-wp-upgrader.php (modified) (5 diffs)
• wp-admin/update-core.php (modified) (3 diffs)
• wp-includes/update.php (modified) (1 diff)

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

@@ -433 +433 @@
                                 ));
 
-                //Cleanup our hooks, incase something else does a upgrade on this connection.
+                // Cleanup our hooks, incase something else does a upgrade on this connection.
                 remove_filter('upgrader_pre_install', array(&$this, 'deactivate_plugin_before_upgrade'));
                 remove_filter('upgrader_clear_destination', array(&$this, 'delete_old_plugin'));
@@ -452 +452 @@
                 $current = get_transient( 'update_plugins' );
 
-                add_filter('upgrader_pre_install', array(&$this, 'deactivate_plugin_before_upgrade'), 10, 2);
                 add_filter('upgrader_clear_destination', array(&$this, 'delete_old_plugin'), 10, 4);
 
                 $this->skin->header();
+
+                // Connect to the Filesystem first.
+                $res = $this->fs_connect( array(WP_CONTENT_DIR, WP_PLUGIN_DIR) );
+                if ( ! $res ) {
+                        $this->skin->footer();
+                        return false;
+                }
+
+                $this->maintenance_mode(true);
+
                 $all = count($plugins);
                 $i = 1;
@@ -493 +502 @@
                                 break;
                 }
+                $this->maintenance_mode(false);
                 $this->skin->footer();
 
-                //Cleanup our hooks, incase something else does a upgrade on this connection.
-                remove_filter('upgrader_pre_install', array(&$this, 'deactivate_plugin_before_upgrade'));
+                // Cleanup our hooks, incase something else does a upgrade on this connection.
                 remove_filter('upgrader_clear_destination', array(&$this, 'delete_old_plugin'));
 
@@ -900 +909 @@
 
         function after() {
+                if ( $this->upgrader->bulk )
+                        return;
+
                 $this->plugin = $this->upgrader->plugin_info();
                 if( !empty($this->plugin) && !is_wp_error($this->result) && $this->plugin_active ){
@@ -905 +917 @@
                         echo '<iframe style="border:0;overflow:hidden" width="100%" height="170px" src="' . wp_nonce_url('update.php?action=activate-plugin&plugin=' . $this->plugin, 'activate-plugin_' . $this->plugin) .'"></iframe>';
                 }
+
                 $update_actions =  array(
                         'activate_plugin' => '<a href="' . wp_nonce_url('plugins.php?action=activate&amp;plugin=' . $this->plugin, 'activate-plugin_' . $this->plugin) . '" title="' . esc_attr__('Activate this plugin') . '" target="_parent">' . __('Activate Plugin') . '</a>',

trunk/wp-admin/update-core.php

@@ -134 +134 @@
 
 function list_plugin_updates() {
+        global $wp_version;
+
+        $cur_wp_version = preg_replace('/-.*$/', '', $wp_version);
+
+        require_once(ABSPATH . 'wp-admin/includes/plugin-install.php');
         $plugins = get_plugin_updates();
         if ( empty($plugins) )
@@ -161 +166 @@
 <?php
         foreach ( (array) $plugins as $plugin_file => $plugin_data) {
+                $info = plugins_api('plugin_information', array('slug' => $plugin_data->update->slug ));
+                if ( isset($info->compatibility[$cur_wp_version][$plugin_data->update->new_version]) ) {
+                        $compat = $info->compatibility[$cur_wp_version][$plugin_data->update->new_version];
+                        $compat = '  ' . sprintf(__('Compatibility: %1$d%% (%2$d "works" votes out of %3$d total)'), $compat[0], $compat[2], $compat[1]);
+                } else {
+                        $compat = '';
+                }
                 echo "
         <tr class='active'>
                 <th scope='row' class='check-column'><input type='checkbox' name='checked[]' value='" . esc_attr($plugin_file) . "' /></th>
-                <td class='plugin-title'><strong>{$plugin_data->Name}</strong>" . sprintf(__('You are running version %1$s. Upgrade to %2$s.'), $plugin_data->Version, $plugin_data->update->new_version) . "</td>
+                <td class='plugin-title'><strong>{$plugin_data->Name}</strong>" . sprintf(__('You are running version %1$s. Upgrade to %2$s.'), $plugin_data->Version, $plugin_data->update->new_version) . $compat . "</td>
         </tr>";
         }
@@ -301 +313 @@
         $title = __('Upgrade Plugins');
         $nonce = 'upgrade-core';
-        add_filter('update_plugin_complete_actions', 'no_update_actions');
-
         $upgrader = new Plugin_Upgrader( new Plugin_Upgrader_Skin( compact('title', 'nonce', 'url', 'plugin') ) );
         $upgrader->bulk_upgrade($plugins);

trunk/wp-includes/update.php

@@ -315 +315 @@
 add_action( 'load-plugins.php', 'wp_update_plugins' );
 add_action( 'load-update.php', 'wp_update_plugins' );
+add_action( 'load-update-core.php', 'wp_update_plugins' );
 add_action( 'admin_init', '_maybe_update_plugins' );
 add_action( 'wp_update_plugins', 'wp_update_plugins' );