From 4451f3f64f7b141001b4d27b3a5839548cd51490 Mon Sep 17 00:00:00 2001
From: nacin <nacin@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Sat, 20 Feb 2010 14:07:23 +0000
Subject: [PATCH] Minor MS startup cleanups. See #11644

git-svn-id: http://svn.automattic.com/wordpress/trunk@13254 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/ms-load.php     |  1 -
 wp-includes/ms-settings.php | 12 ++++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/wp-includes/ms-load.php b/wp-includes/ms-load.php
index 785a82983..03b1f8c16 100644
--- a/wp-includes/ms-load.php
+++ b/wp-includes/ms-load.php
@@ -180,7 +180,6 @@ function wpmu_current_site() {
  *
  * Used when blog does not exist. Checks for a missing $wpdb->site table as well.
  *
- * @todo Merge with is_blog_installed(), dead_db(), wp_not_installed(), etc.
  * @access private
  * @since 3.0.0
  */
diff --git a/wp-includes/ms-settings.php b/wp-includes/ms-settings.php
index 92f82ec40..ae7e801e5 100644
--- a/wp-includes/ms-settings.php
+++ b/wp-includes/ms-settings.php
@@ -48,7 +48,7 @@ if ( ! isset( $current_site->blog_id ) )
 if ( is_subdomain_install() ) {
 	$current_blog = wp_cache_get( 'current_blog_' . $domain, 'site-options' );
 	if ( !$current_blog ) {
-		$current_blog = get_blog_details( array('domain' => $domain), false );
+		$current_blog = get_blog_details( array( 'domain' => $domain ), false );
 		if ( $current_blog )
 			wp_cache_set( 'current_blog_' . $domain, $current_blog, 'site-options' );
 	}
@@ -67,7 +67,7 @@ if ( is_subdomain_install() ) {
 		$path .= $blogname . '/';
 	$current_blog = wp_cache_get( 'current_blog_' . $domain . $path, 'site-options' );
 	if ( ! $current_blog ) {
-		$current_blog = $current_blog = get_blog_details( array('domain' => $domain, 'path' => $path ), false );
+		$current_blog = get_blog_details( array( 'domain' => $domain, 'path' => $path ), false );
 		if ( $current_blog )
 			wp_cache_set( 'current_blog_' . $domain . $path, $current_blog, 'site-options' );
 	}
@@ -91,7 +91,7 @@ if ( ! defined( 'WP_INSTALLING' ) ) {
 			header( 'Location: http://' . $current_site->domain . $current_site->path );
 			exit;
 		}
-		$current_blog = get_blog_details( array('domain' => $current_site->domain, 'path' => $current_site->path), false );
+		$current_blog = get_blog_details( array( 'domain' => $current_site->domain, 'path' => $current_site->path ), false );
 	}
 	if ( ! $current_blog || ! $current_site )
 		ms_not_installed();
@@ -107,10 +107,10 @@ $site_id = $current_blog->site_id;
 $current_site = get_current_site_name( $current_site );
 
 if ( ! $blog_id ) {
-	if ( defined('WP_INSTALLING') ) {
+	if ( defined( 'WP_INSTALLING' ) ) {
 		$current_blog->blog_id = $blog_id = 1;
     } else {
-		$msg = ! $wpdb->get_var( "SHOW TABLES LIKE '$wpdb->site'" ) ? __( 'Database tables are missing.' ) : '';
+		$msg = ! $wpdb->get_var( "SHOW TABLES LIKE '$wpdb->site'" ) ? ' ' . __( 'Database tables are missing.' ) : '';
 		wp_die( __( 'No blog by that name on this system.' ) . $msg );
     }
 }
@@ -124,6 +124,6 @@ $table_prefix = $wpdb->get_blog_prefix();
 wp_start_object_cache();
 
 // Define upload directory constants
-ms_upload_constants(  );
+ms_upload_constants();
 
 ?>