diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-07-11 16:12:47 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-07-11 16:12:47 +0000 |
| commit | a8a5dc5214b92fc26003983f599dd25e88660084 (patch) | |
| tree | 4ba3e353fadcbc6a9829977b0c1db14af5ab4d34 /wpmu-settings.php | |
| parent | 71035d5d0ed13cc388f1c729d7b8fab8b321038c (diff) | |
| download | wordpress-mu-a8a5dc5214b92fc26003983f599dd25e88660084.tar.gz wordpress-mu-a8a5dc5214b92fc26003983f599dd25e88660084.tar.xz wordpress-mu-a8a5dc5214b92fc26003983f599dd25e88660084.zip | |
Make sure the site_id is always set to something. Fixes #600, but presumes it's site_id 1
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1373 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wpmu-settings.php')
| -rw-r--r-- | wpmu-settings.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/wpmu-settings.php b/wpmu-settings.php index c639541..838c96b 100644 --- a/wpmu-settings.php +++ b/wpmu-settings.php @@ -134,10 +134,11 @@ function is_blogname_page( $blogname ) { $blog_id = $current_blog->blog_id;
$public = $current_blog->public;
+
+if( $current_blog->site_id == 0 || $current_blog->site_id == '' )
+ $current_blog->site_id = 1;
$site_id = $current_blog->site_id;
-if( $site_id == 0 )
- $site_id = 1;
$current_site->site_name = $wpdb->get_var( "SELECT meta_value FROM $wpdb->sitemeta WHERE site_id = '$site_id' AND meta_key = 'site_name'" );
if( $current_site->site_name == null )
|