Ticket #36227: 36227.patch

wp-includes/category.php

@@ -21 +21 @@
  *
  *     @type string $taxonomy Taxonomy to retrieve terms for. In this case, default 'category'.
  * }
- * @return array List of categories.
+ * @return array|WP_Error List of categories.
  */
 function get_categories( $args = '' ) {
         $defaults = array( 'taxonomy' => 'category' );
         $args = wp_parse_args( $args, $defaults );
 
-        $taxonomy = $args['taxonomy'];
-
         /**
          * Filter the taxonomy used to retrieve terms when calling {@see get_categories()}.
          *
@@ -37 +35 @@
          * @param string $taxonomy Taxonomy to retrieve terms from.
          * @param array  $args     An array of arguments. See {@see get_terms()}.
          */
-        $taxonomy = apply_filters( 'get_categories_taxonomy', $taxonomy, $args );
+        $args['taxonomy'] = apply_filters( 'get_categories_taxonomy', $args['taxonomy'], $args );
 
         // Back compat
         if ( isset($args['type']) && 'link' == $args['type'] ) {
@@ -48 +46 @@
                                 '<code>taxonomy => link_category</code>'
                         )
                 );
-                $taxonomy = $args['taxonomy'] = 'link_category';
+
+                $args['taxonomy'] = 'link_category';
         }
 
-        $categories = (array) get_terms( $taxonomy, $args );
+        $categories = get_terms( $args );
 
-        foreach ( array_keys( $categories ) as $k )
-                _make_cat_compat( $categories[$k] );
+        if ( ! is_wp_error( $args['taxonomy'] ) ) {
+                foreach ( array_keys( $categories ) as $k ) {
+                        _make_cat_compat( $categories[ $k ] );
+                }
+        }
 
         return $categories;
 }