From 5ba17b01b84301bb0141e1ae59262303d36dfc75 Mon Sep 17 00:00:00 2001 From: markjaquith Date: Thu, 15 Feb 2007 08:16:43 +0000 Subject: [PATCH] Fewer clicks and better user experience for upgrades. fixes #2447 git-svn-id: http://svn.automattic.com/wordpress/trunk@4887 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/admin.php | 8 +++++--- wp-admin/upgrade.php | 29 ++++++++++++++++++++--------- 2 files changed, 25 insertions(+), 12 deletions(-) diff --git a/wp-admin/admin.php b/wp-admin/admin.php index d637d3238..b5b83a7ad 100644 --- a/wp-admin/admin.php +++ b/wp-admin/admin.php @@ -4,9 +4,11 @@ if ( defined('ABSPATH') ) else require_once('../wp-config.php'); -if ( get_option('db_version') != $wp_db_version ) - wp_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?_wp_http_referer=' . urlencode(stripslashes($_SERVER['REQUEST_URI']))); + exit; +} + require_once(ABSPATH . 'wp-admin/admin-functions.php'); require_once(ABSPATH . 'wp-admin/admin-db.php'); require_once(ABSPATH . WPINC . '/registration.php'); diff --git a/wp-admin/upgrade.php b/wp-admin/upgrade.php index b6f8d6431..7008ccadf 100644 --- a/wp-admin/upgrade.php +++ b/wp-admin/upgrade.php @@ -8,7 +8,7 @@ timer_start(); require_once(ABSPATH . '/wp-admin/upgrade-functions.php'); if (isset($_GET['step'])) - $step = $_GET['step']; + $step = (int) $_GET['step']; else $step = 0; @header('Content-type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset')); @@ -25,12 +25,21 @@ else

WordPress

- + +

+

+

+ + -

+?> +

+

+

-

-

Have fun!"), $backto); ?>

+

+

+