Removed sitemeta siteurl.

Created $current_site var with site details.


git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@50 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 5 insertions, 1 deletions

diff --git a/wp-inst/wp-settings.php b/wp-inst/wp-settings.php
index fb45454..a9b8784 100644
--- a/wp-inst/wp-settings.php
+++ b/wp-inst/wp-settings.php
@@ -52,10 +52,14 @@ if( substr( $domain, 0, 4 ) == 'www.' )
 	$domain = substr( $domain, 4 );
 
 $current_blog = $wpdb->get_row("SELECT * FROM $wpdb->blogs WHERE domain = '$domain' AND path = '$base'");
-
 $blog_id   = $current_blog->blog_id;
 $is_public = $current_blog->is_public;
 $site_id   = $current_blog->site_id;
+
+$current_site = $wpdb->get_row("SELECT * FROM $wpdb->site WHERE id='$site_id'");
+if( $current_site->domain == $domain && $current_site->path == $base ) {
+	$wpblog = 'main';
+}
 if( $blog_id == false ) {
     // no blog found, are we installing? Check if the table exists.
     if ( defined('WP_INSTALLING') ) {