diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-10-12 16:21:15 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-10-12 16:21:15 +0000 |
| commit | 3a4570b0fc8b3d6339bef71d17d7701554e0bbf7 (patch) | |
| tree | 2a06e5261263c68d8afd95a6328879dc289cb909 /wp-admin/upgrade.php | |
| parent | b83c34a7010faee0223f6037025c350da12e05e6 (diff) | |
| download | wordpress-mu-3a4570b0fc8b3d6339bef71d17d7701554e0bbf7.tar.gz wordpress-mu-3a4570b0fc8b3d6339bef71d17d7701554e0bbf7.tar.xz wordpress-mu-3a4570b0fc8b3d6339bef71d17d7701554e0bbf7.zip | |
Merge with WP 2.3 - testing use only!
Move pluggable functions out of wpmu-functions and into pluggable.php, fixes #439
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1069 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-admin/upgrade.php')
| -rw-r--r-- | wp-admin/upgrade.php | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/wp-admin/upgrade.php b/wp-admin/upgrade.php index b08ffba..b8069b5 100644 --- a/wp-admin/upgrade.php +++ b/wp-admin/upgrade.php @@ -5,23 +5,20 @@ if (!file_exists('../wp-config.php')) require('../wp-config.php'); timer_start(); -require_once(ABSPATH . '/wp-admin/upgrade-functions.php'); +require_once(ABSPATH . 'wp-admin/includes/upgrade.php'); if (isset($_GET['step'])) $step = (int) $_GET['step']; else $step = 0; -@header('Content-type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset')); +@header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset')); ?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>> <head> <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" /> <title><?php _e('WordPress › Upgrade'); ?></title> - <link rel="stylesheet" href="<?php echo get_option('siteurl') ?>/wp-admin/install.css?version=<?php bloginfo('version'); ?>" type="text/css" /> - <?php if ( ('rtl' == $wp_locale->text_direction) ) : ?> - <link rel="stylesheet" href="<?php echo get_option('siteurl') ?>/wp-admin/install-rtl.css?version=<?php bloginfo('version'); ?>" type="text/css" /> - <?php endif; ?> + <?php wp_admin_css( 'css/install' ); ?> </head> <body> <h1 id="logo"><img alt="WordPress" src="images/wordpress-logo.png" /></h1> @@ -39,7 +36,7 @@ switch($step) : ?> <h2><?php _e('Database Upgrade Required'); ?></h2> <p><?php _e('Your WordPress database is out-of-date, and must be upgraded before you can continue.'); ?></p> -<p><?php _e('The upgrade process may take a while, so please be patient.'); ?></p> +<p><?php _e('The upgrade process may take a while, so please be patient.'); ?></p> <h2 class="step"><a href="upgrade.php?step=1&backto=<?php echo $goback; ?>"><?php _e('Upgrade WordPress »'); ?></a></h2> <?php break; |