diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-04-10 16:06:03 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-04-10 16:06:03 +0000 |
| commit | b9502152383917bc805532b343026345c2856434 (patch) | |
| tree | 531386fc4d841b213f6993dab639712713ed4945 /wp-admin/includes/mu.php | |
| parent | ce8e03d16012399913cdf3f704e128e409091e75 (diff) | |
| download | wordpress-mu-b9502152383917bc805532b343026345c2856434.tar.gz wordpress-mu-b9502152383917bc805532b343026345c2856434.tar.xz wordpress-mu-b9502152383917bc805532b343026345c2856434.zip | |
Use blog_id when comparing blogs, fixes #583
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1229 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-admin/includes/mu.php')
| -rw-r--r-- | wp-admin/includes/mu.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/wp-admin/includes/mu.php b/wp-admin/includes/mu.php index 3cfbe62..76af194 100644 --- a/wp-admin/includes/mu.php +++ b/wp-admin/includes/mu.php @@ -511,7 +511,7 @@ function blogswitch_ob_content( $content ) { } function blogswitch_markup() { - global $current_user, $blog_id; // current blog + global $current_user, $current_blog; $list = array(); $options = array(); @@ -526,7 +526,7 @@ function blogswitch_markup() { $parsed = parse_url( $blog->siteurl ); $domain = $parsed['host']; - if ( $_SERVER['HTTP_HOST'] === $domain ) { + if ( $current_blog->blog_id == $blog->userblog_id ) { $current = ' class="current"'; $selected = ' selected="selected"'; } else { @@ -539,7 +539,7 @@ function blogswitch_markup() { $list_item = "<li><a href='$url'$current>$name</a></li>"; $option_item = "<option value='$url'$selected>$name</option>"; - if ( $blog_id == $blog->userblog_id ) { + if ( $current_blog->blog_id == $blog->userblog_id ) { $list[-2] = $list_item; $options[] = $option_item; // [sic] don't reorder dropdown based on current blog } elseif ( $primary_blog == $blog->userblog_id ) { |