Changeset 23599

Timestamp:

03/04/2013 02:52:43 AM (11 years ago)

Author:

SergeyBiryukov

Message:

Remove unnecessary error suppression from get_terms(). fixes #21887.

File:

• trunk/wp-includes/taxonomy.php (modified) (2 diffs)

trunk/wp-includes/taxonomy.php

@@ -1353 +1353 @@
 
     // don't limit the query results when we have to descend the family tree
-    if ( ! empty($number) && ! $hierarchical && empty( $child_of ) && '' === $parent ) {
+    if ( $number && ! $hierarchical && ! $child_of && '' === $parent ) {
         if ( $offset )
             $limits = 'LIMIT ' . $offset . ',' . $number;
@@ -1458 +1458 @@
     }
 
-    if ( 0 < $number && intval(@count($terms)) > $number ) {
-        $terms = array_slice($terms, $offset, $number);
-    }
+    if ( $number && is_array( $terms ) && count( $terms ) > $number )
+        $terms = array_slice( $terms, $offset, $number );
 
     wp_cache_add( $cache_key, $terms, 'terms', DAY_IN_SECONDS );