Changeset 15469 for trunk/wp-admin/includes/class-wp-upgrader.php

Timestamp:

07/24/2010 03:59:53 AM (14 years ago)

Author:

dd32

Message:

Only use maintenance_mode() for ( is_multisite()

(plugin|theme) being updated is in use ) with Plugin|Theme Bulk Upgrades. See #14393

File:

• trunk/wp-admin/includes/class-wp-upgrader.php (modified) (5 diffs)

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

@@ -469 +469 @@
         $this->skin->bulk_header();
 
-        $this->maintenance_mode(true);
+        // Only start maintenance mode if running in Multisite OR the plugin is in use
+        $maintenance = is_multisite(); // @TODO: This should only kick in for individual sites if at all possible.
+        foreach ( $plugins as $plugin )
+            $maintenance = $maintenance || (is_plugin_active($plugin) && isset($current->response[ $plugin ]) ); // Only activate Maintenance mode if a plugin is active AND has an update available
+        if ( $maintenance )
+            $this->maintenance_mode(true);
 
         $results = array();
@@ -713 +718 @@
         $this->skin->bulk_header();
 
-        $this->maintenance_mode(true);
+        // Only start maintenance mode if running in Multisite OR the theme is in use
+        $maintenance = is_multisite(); // @TODO: This should only kick in for individual sites if at all possible.
+        foreach ( $themes as $theme )
+            $maintenance = $maintenance || $theme == get_stylesheet() || $theme == get_template();
+        if ( $maintenance )
+            $this->maintenance_mode(true);
 
         $results = array();
@@ -781 +791 @@
         if ( $theme != get_stylesheet() ) //If not current
             return $return;
-        //Change to maintainence mode now.
+        //Change to maintenance mode now.
         if ( ! $this->bulk )
             $this->maintenance_mode(true);
@@ -797 +807 @@
 
         //Ensure stylesheet name hasnt changed after the upgrade:
+        // @TODO: Note, This doesnt handle the Template changing, or the Template name changing.
         if ( $theme == get_stylesheet() && $theme != $this->result['destination_name'] ) {
             $theme_info = $this->theme_info();
@@ -804 +815 @@
         }
 
-        //Time to remove maintainence mode
+        //Time to remove maintenance mode
         if ( ! $this->bulk )
             $this->maintenance_mode(false);