From 8439f8cd5c4ce52dd7708f42f41fa007af01a50e Mon Sep 17 00:00:00 2001 From: Andrew Nacin Date: Tue, 27 Sep 2011 07:36:36 +0000 Subject: [PATCH] Ensure we have a full blog object in get_active_blog_for_user(). fixes #18789. git-svn-id: https://develop.svn.wordpress.org/trunk@18791 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-includes/ms-functions.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wp-includes/ms-functions.php b/wp-includes/ms-functions.php index 39f67e3cca..9a3bcce129 100644 --- a/wp-includes/ms-functions.php +++ b/wp-includes/ms-functions.php @@ -81,7 +81,7 @@ function get_active_blog_for_user( $user_id ) { if ( false !== $primary_blog ) { if ( ! isset( $blogs[ $primary_blog ] ) ) { update_user_meta( $user_id, 'primary_blog', $first_blog->userblog_id ); - $primary = $first_blog; + $primary = get_blog_details( $first_blog->userblog_id ); } else { $primary = get_blog_details( $primary_blog ); } @@ -92,7 +92,7 @@ function get_active_blog_for_user( $user_id ) { $primary = $first_blog; } - if ( ( ! is_object( $primary ) ) || ( is_object( $primary ) && $primary->archived == 1 || $primary->spam == 1 || $primary->deleted == 1 ) ) { + if ( ( ! is_object( $primary ) ) || ( $primary->archived == 1 || $primary->spam == 1 || $primary->deleted == 1 ) ) { $blogs = get_blogs_of_user( $user_id, true ); // if a user's primary blog is shut down, check their other blogs. $ret = false; if ( is_array( $blogs ) && count( $blogs ) > 0 ) {