Changeset 34697

Timestamp:

09/29/2015 07:36:16 PM (11 years ago)

Author:

boonebgorges

Message:

WP_Query should not ignore an offset of 0.

Props mazurstas.
Fixes #34060.

Location:

trunk

Files:

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

trunk/src/wp-includes/query.php

@@ -3124 +3124 @@
                                 $page = 1;
 
-                        if ( empty($q['offset']) ) {
+                        // If 'offset' is provided, it takes precedence over 'paged'.
+                        if ( isset( $q['offset'] ) && is_numeric( $q['offset'] ) ) {
+                                $q['offset'] = absint( $q['offset'] );
+                                $pgstrt = $q['offset'] . ', ';
+                        } else {
                                 $pgstrt = absint( ( $page - 1 ) * $q['posts_per_page'] ) . ', ';
-                        } else { // we're ignoring $page and using 'offset'
-                                $q['offset'] = absint($q['offset']);
-                                $pgstrt = $q['offset'] . ', ';
                         }
                         $limits = 'LIMIT ' . $pgstrt . $q['posts_per_page'];

trunk/tests/phpunit/tests/query.php

@@ -460 +460 @@
                 $post = get_queried_object();
         }
+
+        /**
+         * @ticket 34060
+         */
+        public function test_offset_0_should_override_page() {
+                $q = new WP_Query( array(
+                        'paged' => 2,
+                        'posts_per_page' => 5,
+                        'offset' => 0,
+                ) );
+
+                $this->assertContains( 'LIMIT 0, 5', $q->request );
+        }
+
+        /**
+         * @ticket 34060
+         */
+        public function test_offset_should_be_ignored_when_not_set() {
+                $q = new WP_Query( array(
+                        'paged' => 2,
+                        'posts_per_page' => 5,
+                ) );
+
+                $this->assertContains( 'LIMIT 5, 5', $q->request );
+        }
+
+        /**
+         * @ticket 34060
+         */
+        public function test_offset_should_be_ignored_when_passed_a_non_numeric_value() {
+                $q = new WP_Query( array(
+                        'paged' => 2,
+                        'posts_per_page' => 5,
+                        'offset' => '',
+                ) );
+
+                $this->assertContains( 'LIMIT 5, 5', $q->request );
+        }
 }