Wordpress 3.3.1-scripts

[autoinstalls/wordpress.git] / wp-includes / ms-settings.php

diff --git a/wp-includes/ms-settings.php b/wp-includes/ms-settings.php
index 14862f9e16b361c700d22dcac56193cb0cdd420e..42df103d41bef47ad422a65ec46fe812de0a0000 100644 (file)
--- a/wp-includes/ms-settings.php
+++ b/wp-includes/ms-settings.php
@@ -10,10 +10,6 @@
  * @since 3.0.0
  */
 
-// $base sanity check.
-if ( 'BASE' == $base )
-       die( /*WP_I18N_BASE_ERROR*/'Configuration error in <code>wp-config.php</code>. <code>$base</code> is set to <code>BASE</code> when it should be like <code>/</code> or <code>/blogs/</code>.'/*/WP_I18N_BASE_ERROR*/ );
-
 /** Include Multisite initialization functions */
 require( ABSPATH . WPINC . '/ms-load.php' );
 require( ABSPATH . WPINC . '/ms-default-constants.php' );
@@ -59,9 +55,11 @@ if ( !isset( $current_site ) || !isset( $current_blog ) ) {
                        if ( $current_blog )
                                wp_cache_set( 'current_blog_' . $domain, $current_blog, 'site-options' );
                }
-               if ( $current_blog && $current_blog->site_id != $current_site->id )
+               if ( $current_blog && $current_blog->site_id != $current_site->id ) {
                        $current_site = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->site WHERE id = %d", $current_blog->site_id ) );
-               else
+                       if ( ! isset( $current_site->blog_id ) )
+                               $current_site->blog_id = $wpdb->get_var( $wpdb->prepare( "SELECT blog_id FROM $wpdb->blogs WHERE domain = %s AND path = %s", $current_site->domain, $current_site->path ) );
+               } else
                        $blogname = substr( $domain, 0, strpos( $domain, '.' ) );
        } else {
                $blogname = htmlspecialchars( substr( $_SERVER[ 'REQUEST_URI' ], strlen( $path ) ) );
@@ -78,6 +76,7 @@ if ( !isset( $current_site ) || !isset( $current_blog ) ) {
                        if ( $current_blog )
                                wp_cache_set( 'current_blog_' . $domain . $path, $current_blog, 'site-options' );
                }
+               unset($reserved_blognames);
        }
 
        if ( ! defined( 'WP_INSTALLING' ) && is_subdomain_install() && ! is_object( $current_blog ) ) {