Coding style cleanups

git-svn-id: https://develop.svn.wordpress.org/trunk@12734 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ryan Boren
2010-01-15 22:25:40 +00:00
parent 8ef8b7bad5
commit 3dfc463062
4 changed files with 70 additions and 85 deletions

View File

@@ -271,10 +271,9 @@ function wp_start_object_cache() {
}
function wp_not_installed() {
if( is_multisite() ) {
if ( !is_blog_installed() && !defined('WP_INSTALLING') ) {
if ( is_multisite() ) {
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
}
} elseif ( !is_blog_installed() && (strpos($_SERVER['PHP_SELF'], 'install.php') === false && !defined('WP_INSTALLING')) ) {
if ( defined('WP_SITEURL') )
$link = WP_SITEURL . '/wp-admin/install.php';
@@ -329,7 +328,6 @@ function wp_load_plugins() {
unset($plugin);
}
unset($current_plugins);
}
function wp_set_internal_encoding() {