Changeset 36252

Timestamp:

01/10/2016 04:05:26 AM (11 years ago)

Author:

boonebgorges

Message:

Don't reset index keys when trimming results of term queries.

array_slice() must be told to preserve keys when the query results exceed the
limit specified the 'number' parameter, so that id=>parent and other
id-indexed return value formats don't get mangled.

Props fantasyworld, wpdelighter.
Fixes #35382.

Location:

trunk

Files:

• src/wp-includes/taxonomy.php (modified) (1 diff)
• tests/phpunit/tests/term/getTerms.php (modified) (1 diff)

trunk/src/wp-includes/taxonomy.php

@@ -1605 +1605 @@
 
         if ( $number && is_array( $terms ) && count( $terms ) > $number ) {
-                $terms = array_slice( $terms, $offset, $number );
+                $terms = array_slice( $terms, $offset, $number, true );
         }
 

trunk/tests/phpunit/tests/term/getTerms.php

@@ -1666 +1666 @@
         }
 
+        /**
+         * @ticket 35382
+         */
+        public function test_indexes_should_not_be_reset_when_number_of_matched_terms_is_greater_than_number() {
+                register_taxonomy( 'wptests_tax', 'post', array( 'hierarchical' => true ) );
+                $terms = self::factory()->term->create_many( 3, array( 'taxonomy' => 'wptests_tax' ) );
+
+                $found = get_terms( 'wptests_tax', array(
+                        'hide_empty' => false,
+                        'fields' => 'id=>parent',
+                        'number' => 2,
+                        'orderby' => 'id',
+                        'order' => 'ASC',
+                        'hierarchical' => true,
+                ) );
+
+                $this->assertSame( array( $terms[0], $terms[1] ), array_keys( $found ) );
+        }
+
         protected function create_hierarchical_terms_and_posts() {
                 $terms = array();