Changeset 45723 for trunk/src/wp-includes/category.php

Timestamp:

08/03/2019 03:34:54 AM (5 years ago)

Author:

SergeyBiryukov

Message:

Taxonomy: Fix deprecated calls to get_terms().

The taxonomy should be passed as part of $args, rather than as its own argument.

Props sgastard, mukesh27, SergeyBiryukov.
Fixes #47819.

File:

• trunk/src/wp-includes/category.php (modified) (5 diffs)

trunk/src/wp-includes/category.php

@@ -27 +27 @@
     $defaults = array( 'taxonomy' => 'category' );
     $args     = wp_parse_args( $args, $defaults );
-
-    $taxonomy = $args['taxonomy'];
 
     /**
@@ -38 +36 @@
      * @param array  $args     An array of arguments. See get_terms().
      */
-    $taxonomy = apply_filters( 'get_categories_taxonomy', $taxonomy, $args );
+    $args['taxonomy'] = apply_filters( 'get_categories_taxonomy', $args['taxonomy'], $args );
 
     // Back compat
@@ -52 +50 @@
             )
         );
-        $taxonomy         = 'link_category';
-        $args['taxonomy'] = $taxonomy;
-    }
-
-    $categories = get_terms( $taxonomy, $args );
+        $args['taxonomy'] = 'link_category';
+    }
+
+    $categories = get_terms( $args );
 
     if ( is_wp_error( $categories ) ) {
@@ -137 +134 @@
     }
     $categories = get_terms(
-        'category',
         array(
-            'get'  => 'all',
-            'slug' => $leaf_path,
+            'taxonomy' => 'category',
+            'get'      => 'all',
+            'slug'     => $leaf_path,
         )
     );
@@ -280 +277 @@
  */
 function get_tags( $args = '' ) {
-    $tags = get_terms( 'post_tag', $args );
+    $defaults = array( 'taxonomy' => 'post_tag' );
+    $args     = wp_parse_args( $args, $defaults );
+
+    $tags = get_terms( $args );
 
     if ( empty( $tags ) ) {