Changeset 35114

Timestamp:

10/13/2015 02:39:05 AM (9 years ago)

Author:

wonderboymusic

Message:

Users: allow -1 (no limit, use with extreme caution on large sites) as the value for number in WP_User_Query - similar to posts_per_page => -1 in WP_Query.

Adds unit tests.

Props mordauk, jesin, nofearinc.
Fixes #28631.

Location:

trunk

Files:

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

trunk/src/wp-includes/class-wp-user-query.php

@@ -420 +420 @@
 
         // limit
-        if ( isset( $qv['number'] ) && $qv['number'] ) {
+        if ( isset( $qv['number'] ) && $qv['number'] > 0 ) {
             if ( $qv['offset'] ) {
                 $this->query_limit = $wpdb->prepare("LIMIT %d, %d", $qv['offset'], $qv['number']);

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

@@ -436 +436 @@
 
     /**
+     * @ticket 28631
+     */
+    function test_number() {
+        $user_ids = $this->factory->user->create_many( 10 );
+
+        $users = new WP_User_Query( array( 'blog_id' => get_current_blog_id() ) );
+        $users = $users->get_results();
+
+        $this->assertEquals( 12, count( $users ) );
+
+        $users = new WP_User_Query( array( 'blog_id' => get_current_blog_id(), 'number' => 10 ) );
+        $users = $users->get_results();
+        $this->assertEquals( 10, count( $users ) );
+
+        $users = new WP_User_Query( array( 'blog_id' => get_current_blog_id(), 'number' => -1 ) );
+        $users = $users->get_results();
+        $this->assertEquals( 12, count( $users ) );
+    }
+
+    /**
      * @ticket 21119
      */
@@ -470 +490 @@
         $query->prepare_query();
         $this->assertEquals( $_query_vars, $query->query_vars );
+
+        $query->prepare_query( array( 'number' => -1 ) );
+        $this->assertNotEquals( 'LIMIT -1', $query->query_limit );
+        $this->assertEmpty( $query->query_limit );
     }