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

Timestamp:

08/17/2013 05:35:17 AM (11 years ago)

Author:

dd32

Message:

WP_Upgrader: Don't activate maintenance mode in bulk_upgrade() when no Themes or Plugins are specified. This doesn't affect Core, but rather, plugins who use the upgrade routines and do not do precautionary tests. Props jamescollins. Fixes #24496

File:

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

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

@@ -488 +488 @@
         $this->skin->bulk_header();
 
-        // 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.
+        // Only start maintenance mode if:
+        // - running Multisite and there are one or more plugins specified, OR
+        // - a plugin with an update available is currently active.
+        // @TODO: For multisite, maintenance mode should only kick in for individual sites if at all possible.
+        $maintenance = ( is_multisite() && ! empty( $plugins ) );
         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
+            $maintenance = $maintenance || ( is_plugin_active( $plugin ) && isset( $current->response[ $plugin] ) );
         if ( $maintenance )
             $this->maintenance_mode(true);
@@ -849 +852 @@
         $this->skin->bulk_header();
 
-        // 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.
+        // Only start maintenance mode if:
+        // - running Multisite and there are one or more themes specified, OR
+        // - a theme with an update available is currently in use.
+        // @TODO: For multisite, maintenance mode should only kick in for individual sites if at all possible.
+        $maintenance = ( is_multisite() && ! empty( $themes ) );
         foreach ( $themes as $theme )
             $maintenance = $maintenance || $theme == get_stylesheet() || $theme == get_template();