Changeset 32001

Timestamp:

04/03/2015 02:13:19 PM (10 years ago)

Author:

boonebgorges

Message:

WP_User_Query: When querying users with 'fields=all', ensure that caps and roles are filled for the current site.

See [15566] for a parallel fix for 'fields=all_with_meta'.

Fixes #31878.

Location:

trunk

Files:

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

trunk/src/wp-includes/user.php

@@ -858 +858 @@
         } elseif ( 'all' == $qv['fields'] ) {
             foreach ( $this->results as $key => $user ) {
-                $this->results[ $key ] = new WP_User( $user );
+                $this->results[ $key ] = new WP_User( $user, '', $qv['blog_id'] );
             }
         }

trunk/tests/phpunit/tests/user/query.php

@@ -600 +600 @@
         $this->assertSame( array( 'author' => true ), $user->caps );
     }
+
+    /**
+     * @ticket 31878
+     */
+    public function test_roles_and_caps_should_be_populated_for_explicit_value_of_different_blog_id_on_ms_when_fields_all() {
+        if ( ! is_multisite() ) {
+            $this->markTestSkipped( __METHOD__ . ' is a multisite-only test.' );
+        }
+
+        $b = $this->factory->blog->create();
+        $u = $this->factory->user->create();
+        add_user_to_blog( $b, $u, 'author' );
+
+        $query = new WP_User_Query( array(
+            'fields' => 'all',
+            'include' => $u,
+            'blog_id' => $b,
+        ) );
+
+        $found = $query->get_results();
+
+        $this->assertNotEmpty( $found );
+        $user = reset( $found );
+        $this->assertSame( array( 'author' ), $user->roles );
+        $this->assertSame( array( 'author' => true ), $user->caps );
+    }
 }