Changeset 9085

Timestamp:

10/05/08 05:45:34 (2 months ago)

Author:

ryan

Message:

Don't die with 503 if WP_INSTALLING. Don't load plugins if WP_INSTALLING. Remove old files and working dir before exiting maintenance mode. see #5560

Files:

• trunk/wp-admin/includes/update-core.php (modified) (2 diffs)
• trunk/wp-settings.php (modified) (2 diffs)

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

@@ -200 +200 @@
-    }
-
-Might have to do upgrade in a separate step.
+Upgrade DB with separate request
-    apply_filters('update_feedback', __('Upgrading database'));
-    $db_upgrade_url = admin_url('upgrade.php?step=upgrade_db');
-    wp_remote_post($db_upgrade_url, array('timeout' => 60));
-
-    // Remove working directory
-    $wp_filesystem->delete($from, true);
-
-    // Remove maintenance file, we're done.
-    $wp_filesystem->delete($maintenance_file);
-
-    // Remove old files
@@ -219 +213 @@
-    }
-
+    // Remove working directory
+    $wp_filesystem->delete($from, true);
+
-    // Force refresh of update information
-    delete_option('update_core');
+
+    // Remove maintenance file, we're done.
+    $wp_filesystem->delete($maintenance_file);
-}
-

trunk/wp-settings.php

@@ -108 +108 @@
-    define( 'WP_CONTENT_DIR', ABSPATH . 'wp-content' ); // no trailing slash, full paths only - WP_CONTENT_URL is defined further down
-
-
+&& !defined('WP_INSTALLING') 
-    if ( file_exists( WP_CONTENT_DIR . '/maintenance.php' ) ) {
-        require_once( WP_CONTENT_DIR . '/maintenance.php' );
@@ -446 +446 @@
-}
-
-
+&& !defined('WP_INSTALLING') 
-    $current_plugins = get_option('active_plugins');
-    if ( is_array($current_plugins) ) {