diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-06-13 17:21:00 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-06-13 17:21:00 +0000 |
| commit | 12de05107e4c8b006bde6ee8916f34eb476d08da (patch) | |
| tree | 123ee54ecd1f3f777373b7df54a4604012d43640 /wp-admin/upgrade.php | |
| parent | e51c7a9ca4bfdb45fa3ec7334bd33871e78c68b1 (diff) | |
| download | wordpress-mu-12de05107e4c8b006bde6ee8916f34eb476d08da.tar.gz wordpress-mu-12de05107e4c8b006bde6ee8916f34eb476d08da.tar.xz wordpress-mu-12de05107e4c8b006bde6ee8916f34eb476d08da.zip | |
WP Merge with revision 8075
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1328 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-admin/upgrade.php')
| -rw-r--r-- | wp-admin/upgrade.php | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/wp-admin/upgrade.php b/wp-admin/upgrade.php index a831abd..dc7ec4b 100644 --- a/wp-admin/upgrade.php +++ b/wp-admin/upgrade.php @@ -1,9 +1,7 @@ <?php define('WP_INSTALLING', true); -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 create a <code>wp-config.php</code> file through a web interface, but this doesn't work for all server setups. The safest way is to manually create the file.</p><p><a href='setup-config.php' class='button'>Create a Configuration File</a>"); -require('../wp-config.php'); +require('../wp-load.php'); timer_start(); require_once(ABSPATH . 'wp-admin/includes/upgrade.php'); @@ -18,7 +16,7 @@ else <head> <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" /> <title><?php _e('WordPress › Upgrade'); ?></title> - <?php wp_admin_css( 'css/install' ); ?> + <?php wp_admin_css( 'install', true ); ?> </head> <body> <h1 id="logo"><img alt="WordPress" src="images/wordpress-logo.png" /></h1> |