Changeset 26012

Timestamp:

11/05/2013 01:34:44 AM (12 years ago)

Author:

wonderboymusic

Message:

Respect paged when offset is used in WP_Query. Adds unit tests.

Props coffee2code.
Fixes #18897.

Location:

trunk

Files:

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

trunk/src/wp-includes/query.php

@@ -2787 +2787 @@
                 $page = 1;
 
-            if ( empty($q['offset']) ) {
-                $pgstrt = ($page - 1) * $q['posts_per_page'] . ', ';
-            } else { // we're ignoring $page and using 'offset'
+            $pgstrt = ($page - 1) * $q['posts_per_page'];
+
+            if ( ! empty( $q['offset'] ) ) {
                 $q['offset'] = absint($q['offset']);
-                $pgstrt = $q['offset'] . ', ';
-            }
-            $limits = 'LIMIT ' . $pgstrt . $q['posts_per_page'];
+                $pgstrt += $q['offset'];
+            }
+            $limits = 'LIMIT ' . $pgstrt . ', ' . $q['posts_per_page'];
         }
 

trunk/tests/phpunit/tests/query/results.php

@@ -279 +279 @@
     }
 
-    /**
-     * @ticket 18897
-     */
     function test_query_offset_and_paged() {
         $posts = $this->q->query('paged=2&offset=3');