diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-06-10 15:17:24 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-06-10 15:17:24 +0000 |
| commit | be7def7bce5501c02c3e499a6a57b7117c3bccd2 (patch) | |
| tree | 6115eb23380f6db44c9a9115b7048a847db54175 | |
| parent | 310940b824eff4a116dcd72ccd339bb602021981 (diff) | |
| download | wordpress-mu-be7def7bce5501c02c3e499a6a57b7117c3bccd2.tar.gz wordpress-mu-be7def7bce5501c02c3e499a6a57b7117c3bccd2.tar.xz wordpress-mu-be7def7bce5501c02c3e499a6a57b7117c3bccd2.zip | |
No need to redirect to install.php - it doesn't exist anyway.
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1325 7be80a69-a1ef-0310-a953-fb0f7c49ff36
| -rw-r--r-- | wp-settings.php | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/wp-settings.php b/wp-settings.php index ae9e40c..724a1a6 100644 --- a/wp-settings.php +++ b/wp-settings.php @@ -243,17 +243,8 @@ include_once(ABSPATH . WPINC . '/streams.php'); include_once(ABSPATH . WPINC . '/gettext.php'); require_once (ABSPATH . WPINC . '/l10n.php'); -if ( !is_blog_installed() && (strpos($_SERVER['PHP_SELF'], 'install.php') === false && !defined('WP_INSTALLING')) ) { - if ( defined('WP_SITEURL') ) - $link = WP_SITEURL . '/wp-admin/install.php'; - elseif (strpos($_SERVER['PHP_SELF'], 'wp-admin') !== false) - $link = preg_replace('|/wp-admin/?.*?$|', '/', $_SERVER['PHP_SELF']) . 'wp-admin/install.php'; - else - $link = preg_replace('|/[^/]+?$|', '/', $_SERVER['PHP_SELF']) . 'wp-admin/install.php'; - require_once(ABSPATH . WPINC . '/kses.php'); - require_once(ABSPATH . WPINC . '/pluggable.php'); - wp_redirect($link); - die(); // have to die here ~ Mark +if ( !is_blog_installed() && !defined('WP_INSTALLING') ) { + die( __( 'The blog you have requested is not installed properly. Please contact the system administrator.' ) ); // have to die here ~ Mark } require (ABSPATH . WPINC . '/formatting.php'); |