Changeset 32626

Timestamp:

05/27/2015 09:22:09 PM (10 years ago)

Author:

jeremyfelt

Message:

Provide all site flag data in objects returned by get_blogs_of_user()

Previously, archived, spam, and deleted properties were forced to 0 when returned by get_blogs_of_user(). This was originally introduced in [21794] as a way to prevent notices when properties were expected.

Instead, we can properly fill these properties with those retrieved from get_blog_details().

Props realloc.
Fixes #32281.

Location:

trunk

Files:

• src/wp-includes/user.php (modified) (2 diffs)
• tests/phpunit/tests/user/multisite.php (modified) (1 diff)

trunk/src/wp-includes/user.php

@@ -1176 +1176 @@
                 'site_id'     => $blog->site_id,
                 'siteurl'     => $blog->siteurl,
-                'archived'    => 0,
-                'spam'        => 0,
-                'deleted'     => 0
+                'archived'    => $blog->archived,
+                'spam'        => $blog->spam,
+                'deleted'     => $blog->deleted,
             );
         }
@@ -1205 +1205 @@
                 'site_id'     => $blog->site_id,
                 'siteurl'     => $blog->siteurl,
-                'archived'    => 0,
-                'spam'        => 0,
-                'deleted'     => 0
+                'archived'    => $blog->archived,
+                'spam'        => $blog->spam,
+                'deleted'     => $blog->deleted,
             );
         }

trunk/tests/phpunit/tests/user/multisite.php

@@ -92 +92 @@
 
         // Passing true as the second parameter should retrieve ALL sites, even if marked.
-        $blog_ids_of_user = array_keys( get_blogs_of_user( $user1_id, true ) );
-        $this->assertEquals( $blog_ids, $blog_ids_of_user );
+        $blogs_of_user = get_blogs_of_user( $user1_id, true );
+        $blog_ids_of_user = array_keys( $blogs_of_user );
+        $this->assertEquals( $blog_ids, $blog_ids_of_user );
+
+        // Check if sites are flagged as expected.
+        $this->assertEquals( 1, $blogs_of_user[ $blog_ids[0] ]->spam );
+        $this->assertEquals( 1, $blogs_of_user[ $blog_ids[1] ]->archived );
+        $this->assertEquals( 1, $blogs_of_user[ $blog_ids[2] ]->deleted );
 
         unset( $blog_ids[0] );