Changeset 25866 for trunk/src/wp-admin/includes/update-core.php

Timestamp:

10/22/2013 05:19:48 PM (11 years ago)

Author:

nacin

Message:

Updates: Disable maintenance mode once we've finished copying files, to minimize disruption.

props dd32.
fixes #25655.

File:

• trunk/src/wp-admin/includes/update-core.php (modified) (3 diffs)

trunk/src/wp-admin/includes/update-core.php

@@ -807 +807 @@
     }
 
+    apply_filters( 'update_feedback', __( 'Disabling Maintenance mode…' ) );
+    // Remove maintenance file, we're done with potential site-breaking changes
+    $wp_filesystem->delete( $maintenance_file );
+
     // 3.5 -> 3.5+ - an empty twentytwelve directory was created upon upgrade to 3.5 for some users, preventing installation of Twenty Twelve.
     if ( '3.5' == $old_wp_version ) {
@@ -861 +865 @@
     // Handle $result error from the above blocks
     if ( is_wp_error($result) ) {
-        $wp_filesystem->delete($maintenance_file);
         $wp_filesystem->delete($from, true);
         return $result;
@@ -887 +890 @@
     else
         delete_option('update_core');
-
-    apply_filters( 'update_feedback', __( 'Disabling Maintenance mode…' ) );
-    // Remove maintenance file, we're done.
-    $wp_filesystem->delete($maintenance_file);
 
     // If we made it this far: