Changeset 36691 for trunk/src/wp-includes/taxonomy.php

Timestamp:

02/24/2016 07:12:45 PM (11 years ago)

Author:

boonebgorges

Message:

Improve 'offset' calculation when querying for hierarchical terms.

When querying for terms in hierarchical taxonomies, get_terms() initially
queries for all matching terms, and then trims the located results based on the
$number and $offset arguments passed to the function. See #8832. However,
a flaw in the original logic meant that results were failing to be trimmed
properly in cases where $offset exceeds the total number of matching terms;
in these cases, we should force an empty array.

Props danielbachhuber.
Fixes #35935.

File:

• trunk/src/wp-includes/taxonomy.php (modified) (1 diff)

trunk/src/wp-includes/taxonomy.php

@@ -1720 +1720 @@
         }
 
-        if ( $number && is_array( $terms ) && count( $terms ) > $number ) {
-                $terms = array_slice( $terms, $offset, $number, true );
+        // Hierarchical queries are not limited, so 'offset' and 'number' must be handled now.
+        if ( $hierarchical && $number && is_array( $terms ) ) {
+                if ( $offset >= count( $terms ) ) {
+                        $terms = array();
+                } else {
+                        $terms = array_slice( $terms, $offset, $number, true );
+                }
         }