Changeset 13254

Timestamp:

02/20/2010 02:07:23 PM (16 years ago)

Author:

nacin

Message:

Minor MS startup cleanups. See #11644

Location:

trunk/wp-includes

Files:

• ms-load.php (modified) (1 diff)
• ms-settings.php (modified) (5 diffs)

trunk/wp-includes/ms-load.php

@@ -181 +181 @@
  * 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

trunk/wp-includes/ms-settings.php

@@ -49 +49 @@
     $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' );
@@ -68 +68 @@
     $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' );
@@ -92 +92 @@
             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 )
@@ -108 +108 @@
 
 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 );
     }
@@ -125 +125 @@
 
 // Define upload directory constants
-ms_upload_constants(  );
+ms_upload_constants();
 
 ?>