Changeset 42866 for trunk/src/wp-includes/ms-functions.php

Timestamp:

03/20/2018 11:06:57 PM (6 years ago)

Author:

jeremyfelt

Message:

Multisite: Return WP_Site as expected in get_active_blog_for_user().

Previously it was possible for a standard object representing the site to be returned in some cases.

Fixes #38430.

File:

• trunk/src/wp-includes/ms-functions.php (modified) (1 diff)

trunk/src/wp-includes/ms-functions.php

@@ -77 +77 @@
                 $details = get_site( $blog_id );
                 if ( is_object( $details ) && $details->archived == 0 && $details->spam == 0 && $details->deleted == 0 ) {
-                    $ret = $blog;
+                    $ret = $details;
                     if ( get_user_meta( $user_id, 'primary_blog', true ) != $blog_id ) {
                         update_user_meta( $user_id, 'primary_blog', $blog_id );
                     }
                     if ( ! get_user_meta( $user_id, 'source_domain', true ) ) {
-                        update_user_meta( $user_id, 'source_domain', $blog->domain );
+                        update_user_meta( $user_id, 'source_domain', $details->domain );
                     }
                     break;