Ticket #41837: 41837.patch

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

@@ -487 +487 @@
 
                 $this->query_orderby = 'ORDER BY ' . implode( ', ', $orderby_array );
 
-                // limit
-                if ( isset( $qv['number'] ) && $qv['number'] > 0 ) {
-                        if ( $qv['offset'] ) {
-                                $this->query_limit = $wpdb->prepare("LIMIT %d, %d", $qv['offset'], $qv['number']);
+                $number = intval( $qv['number'] ); // -1 is supported
+                $offset = absint( $qv['offset'] );
+                $paged  = absint( $qv['paged'] );       
+
+                // Limit 
+                if ( $number > 0 ) {
+                        if ( $offset > 0 ) {                                                            
+                                $calc_offset = $offset;
+                        } elseif( $paged > 0 ) {
+                                $calc_offset = $number * ( $paged - 1 );   
                         } else {
-                                $this->query_limit = $wpdb->prepare( "LIMIT %d, %d", $qv['number'] * ( $qv['paged'] - 1 ), $qv['number'] );
-                        }
-                }
+                                $calc_offset = 0;
+                        }                                               
+                        $this->query_limit = $wpdb->prepare( "LIMIT %d, %d", $calc_offset, $number );
+                }
 
                 $search = '';
                 if ( isset( $qv['search'] ) )

tests/phpunit/tests/user/query.php

@@ -1072 +1072 @@
         }
 
         /**
+         * @ticket 
+         */
+        public function test_paged_zero_should_be_same_as_page_one() {
+
+                $query0 = new WP_User_Query( array(
+                        'number'        => 2,
+                        'paged'         => 0,
+                ) );
+
+                $query1 = new WP_User_Query( array(
+                        'number'        => 2,
+                        'paged'         => 1,
+                ) );
+
+                $this->assertSame( $query0->request, $query1->request );
+        }
+
+        /**
          * @ticket 33449
          */
         public function test_query_vars_should_be_filled_in_after_pre_get_users() {