Index: wp-admin/admin.php
===================================================================
--- wp-admin/admin.php (revision 3659)
+++ wp-admin/admin.php (working copy)
@@ -4,9 +4,11 @@
else
require_once('../wp-config.php');
-if ( get_option('db_version') != $wp_db_version )
- die (sprintf(__("Your database is out-of-date. Please upgrade."), get_option('siteurl') . '/wp-admin/upgrade.php'));
-
+if ( get_option('db_version') != $wp_db_version ) {
+ wp_redirect(get_option('siteurl') . '/wp-admin/upgrade.php');
+ die();
+}
+
require_once(ABSPATH . 'wp-admin/admin-functions.php');
require_once(ABSPATH . 'wp-admin/admin-db.php');
require_once(ABSPATH . WPINC . '/registration-functions.php');
Index: wp-admin/upgrade-functions.php
===================================================================
--- wp-admin/upgrade-functions.php (revision 3659)
+++ wp-admin/upgrade-functions.php (working copy)
@@ -8,9 +8,12 @@
global $wp_current_db_version, $wp_db_version, $wp_rewrite;
$wp_current_db_version = __get_option('db_version');
+ // Return of true indicates that upgrade took place
+ $return = false;
+
// We are up-to-date. Nothing to do.
if ( $wp_db_version == $wp_current_db_version )
- return;
+ return false;
// If the version is not set in the DB, try to guess the version.
if ( empty($wp_current_db_version) ) {
@@ -29,17 +32,24 @@
upgrade_101();
upgrade_110();
upgrade_130();
+ $return = true;
}
- if ( $wp_current_db_version < 3308 )
+ if ( $wp_current_db_version < 3308 ) {
upgrade_160();
+ $return = true;
+ }
- if ( $wp_current_db_version < 3582 )
+ if ( $wp_current_db_version < 3582 ) {
upgrade_210();
+ $return = true;
+ }
$wp_rewrite->flush_rules();
update_option('db_version', $wp_db_version);
+
+ return $return;
}
function upgrade_100() {
@@ -731,14 +741,20 @@
$alterations = dbDelta($wp_queries);
echo "\n";
- foreach($alterations as $alteration) echo "- $alteration
\n";
+ foreach ( (array) $alterations as $alteration) echo "- $alteration
\n";
echo "
\n";
+ if ( $alterations )
+ return true;
+ return false;
}
function make_db_current_silent() {
global $wp_queries;
$alterations = dbDelta($wp_queries);
+ if ( $alterations )
+ return true;
+ return false;
}
function make_site_theme_from_oldschool($theme_name, $template) {
Index: wp-admin/upgrade.php
===================================================================
--- wp-admin/upgrade.php (revision 3659)
+++ wp-admin/upgrade.php (working copy)
@@ -5,8 +5,6 @@
timer_start();
require_once(ABSPATH . '/wp-admin/upgrade-functions.php');
-$step = $_GET['step'];
-if (!$step) $step = 0;
header( 'Content-Type: text/html; charset=utf-8' );
?>
@@ -63,30 +61,40 @@
+
+
+
-
-
+ wp_cache_flush();
+?>
+
+
+
-
- Have fun!"), $backto); ?>
+
+ go back to what you were doing!"), $backto); ?>
+
-
-