]> scripts.mit.edu Git - autoinstalls/wordpress.git/blobdiff - wp-admin/upgrade.php
scripts.mit.edu / autoinstalls / wordpress.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Wordpress 2.3.2
[autoinstalls/wordpress.git] / wp-admin / upgrade.php
diff --git a/wp-admin/upgrade.php b/wp-admin/upgrade.php
index aa459514772d6ec5383cc190b5c857927b108ff1..1758d4c9b3d53a8dbb70b3bf5b36faa2426186a7 100644 (file)
--- a/wp-admin/upgrade.php
+++ b/wp-admin/upgrade.php
@@ -1,95 +1,56 @@
 <?php
 define('WP_INSTALLING', true);
 <?php
 define('WP_INSTALLING', true);
-if (!file_exists('../wp-config.php')) die("There doesn't seem to be a wp-config.php file. Double check that you updated wp-config-sample.php with the proper database connection information and renamed it to wp-config.php.");
+if (!file_exists('../wp-config.php'))
+       die("There doesn't seem to be a <code>wp-config.php</code> file. I need this before we can get started. Need more help? <a href='http://codex.wordpress.org/Installing_WordPress#Step_3:_Set_up_wp-config.php'>We got it</a>. You can <a href='setup-config.php'>create a <code>wp-config.php</code> file through a web interface</a>, but this doesn't work for all server setups. The safest way is to manually create the file.");
+
 require('../wp-config.php');
 timer_start();
 require('../wp-config.php');
 timer_start();
-require_once(ABSPATH . '/wp-admin/upgrade-functions.php');
+require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
 
 
-$step = $_GET['step'];
-if (!$step) $step = 0;
-header( 'Content-Type: text/html; charset=utf-8' );
+if (isset($_GET['step']))
+       $step = (int) $_GET['step'];
+else
+       $step = 0;
+@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">
 ?>
 <!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">
+<html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>>
 <head>
 <head>
-       <title>WordPress &rsaquo; Upgrade</title>
-       <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-       <style media="screen" type="text/css">
-       <!--
-       html {
-               background: #eee;
-       }
-       body {
-               background: #fff;
-               color: #000;
-               font-family: Georgia, "Times New Roman", Times, serif;
-               margin-left: 20%;
-               margin-right: 20%;
-               padding: .2em 2em;
-       }
-       
-       h1 {
-               color: #006;
-               font-size: 18px;
-               font-weight: lighter;
-       }
-       
-       h2 {
-               font-size: 16px;
-       }
-       
-       p, li, dt {
-               line-height: 140%;
-               padding-bottom: 2px;
-       }
-
-       ul, ol {
-               padding: 5px 5px 5px 20px;
-       }
-       #logo {
-               margin-bottom: 2em;
-       }
-.step a, .step input {
-       font-size: 2em;
-}
-.step, th {
-       text-align: right;
-}
-#footer {
-text-align: center; border-top: 1px solid #ccc; padding-top: 1em; font-style: italic;
-}
-       -->
-       </style>
+       <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
+       <title><?php _e('WordPress &rsaquo; Upgrade'); ?></title>
+       <?php wp_admin_css( 'css/install' ); ?>
 </head>
 <body>
 <h1 id="logo"><img alt="WordPress" src="images/wordpress-logo.png" /></h1>
 </head>
 <body>
 <h1 id="logo"><img alt="WordPress" src="images/wordpress-logo.png" /></h1>
-<?php
-switch($step) {
 
 
+<?php if ( get_option('db_version') == $wp_db_version ) : ?>
+
+<h2><?php _e('No Upgrade Required'); ?></h2>
+<p><?php _e('Your WordPress database is already up-to-date!'); ?></p>
+<h2 class="step"><a href="<?php echo get_option('home'); ?>/"><?php _e('Continue &raquo;'); ?></a></h2>
+
+<?php else :
+switch($step) :
        case 0:
        case 0:
-       $goback = clean_url(stripslashes(wp_get_referer()));
-?> 
-<p><?php _e('This file upgrades you from any previous version of WordPress to the latest. It may take a while though, so be patient.'); ?></p> 
-       <h2 class="step"><a href="upgrade.php?step=1&amp;backto=<?php echo $goback; ?>"><?php _e('Upgrade WordPress &raquo;'); ?></a></h2>
+               $goback = clean_url(stripslashes(wp_get_referer()));
+?>
+<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>
+<h2 class="step"><a href="upgrade.php?step=1&amp;backto=<?php echo $goback; ?>"><?php _e('Upgrade WordPress &raquo;'); ?></a></h2>
 <?php
 <?php
-       break;
-       
+               break;
        case 1:
        case 1:
-       $wp_current_db_version = __get_option('db_version');
-       if ( $wp_db_version != $wp_current_db_version ) {
-               wp_cache_flush();
-               make_db_current_silent();
-               upgrade_all();
-               wp_cache_flush();
-       }
+               wp_upgrade();
 
 
-       if ( empty( $_GET['backto'] ) )
-               $backto = __get_option('home');
-       else
-               $backto = clean_url(stripslashes($_GET['backto']));
-?> 
-<h2><?php _e('Step 1'); ?></h2> 
-       <p><?php printf(__("There's actually only one step. So if you see this, you're done. <a href='%s'>Have fun</a>!"),  $backto); ?></p>
+               if ( empty( $_GET['backto'] ) )
+                       $backto = __get_option('home') . '/';
+               else
+                       $backto = clean_url(stripslashes($_GET['backto']));
+?>
+<h2><?php _e('Upgrade Complete'); ?></h2>
+       <p><?php _e('Your WordPress database has been successfully upgraded!'); ?></p>
+       <h2 class="step"><a href="<?php echo $backto; ?>"><?php _e('Continue &raquo;'); ?></a></h2>
 
 <!--
 <pre>
 
 <!--
 <pre>
@@ -100,8 +61,9 @@ switch($step) {
 -->
 
 <?php
 -->
 
 <?php
-       break;
-}
-?> 
+               break;
+endswitch;
+endif;
+?>
 </body>
 </body>
-</html>
+</html>
\ No newline at end of file
WordPress autoinstaller for phpBB