Changeset 36988

Timestamp:

03/14/2016 01:52:14 PM (8 years ago)

Author:

boonebgorges

Message:

Improve error handling in get_categories().

When passed an invalid 'taxonomy', get_terms() will return a WP_Error
object. This object should not be blindly cast to an array. Instead, an empty
array should be returned, to indicate that no matching terms have been found.

Props virgodesign, sebastian.pisula.
Fixes #36227.

Location:

trunk

Files:

• src/wp-includes/category.php (modified) (1 diff)
• tests/phpunit/tests/category/getCategories.php (added)

trunk/src/wp-includes/category.php

@@ -52 +52 @@
     }
 
-    $categories = (array) get_terms( $taxonomy, $args );
-
-    foreach ( array_keys( $categories ) as $k )
-        _make_cat_compat( $categories[$k] );
+    $categories = get_terms( $taxonomy, $args );
+
+    if ( is_wp_error( $categories ) ) {
+        $categories = array();
+    } else {
+        $categories = (array) $categories;
+        foreach ( array_keys( $categories ) as $k ) {
+            _make_cat_compat( $categories[ $k ] );
+        }
+    }
 
     return $categories;