Changeset 18791

Timestamp:

09/27/2011 07:36:36 AM (13 years ago)

Author:

nacin

Message:

Ensure we have a full blog object in get_active_blog_for_user(). fixes #18789.

File:

• trunk/wp-includes/ms-functions.php (modified) (2 diffs)

trunk/wp-includes/ms-functions.php

@@ -82 +82 @@
         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 );
@@ -93 +93 @@
     }
 
-    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;