From a8a5dc5214b92fc26003983f599dd25e88660084 Mon Sep 17 00:00:00 2001 From: donncha Date: Fri, 11 Jul 2008 16:12:47 +0000 Subject: 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 --- wpmu-settings.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'wpmu-settings.php') 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 ) -- cgit