X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/699231ae09f7057a4d0000cdf32e50a3df6a04ca..96bc8e88cf39086a9e0a883b8e2c311fe82a5e97:/wp-includes/ms-settings.php?ds=sidebyside
diff --git a/wp-includes/ms-settings.php b/wp-includes/ms-settings.php
index 14862f9e..42df103d 100644
--- 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 wp-config.php
. $base
is set to BASE
when it should be like /
or /blogs/
.'/*/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 ) ) {