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

Timestamp:

08/03/2019 03:34:54 AM (6 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/taxonomy.php (modified) (6 diffs)

trunk/src/wp-includes/taxonomy.php

@@ -1132 +1132 @@
  *                                 parameter will be interpreted as `$args`, and the first function parameter will
  *                                 be parsed as a taxonomy or array of taxonomies.
- * @return array|int|WP_Error List of WP_Term instances and their children. Will return WP_Error, if any of $taxonomies
+ * @return array|int|WP_Error List of WP_Term instances and their children. Will return WP_Error, if any of taxonomies
  *                            do not exist.
  */
@@ -1686 +1686 @@
  */
 function wp_count_terms( $taxonomy, $args = array() ) {
-    $defaults = array( 'hide_empty' => false );
+    $defaults = array(
+        'taxonomy'   => $taxonomy,
+        'hide_empty' => false,
+    );
     $args     = wp_parse_args( $args, $defaults );
 
@@ -1697 +1700 @@
     $args['fields'] = 'count';
 
-    return get_terms( $taxonomy, $args );
+    return get_terms( $args );
 }
 
@@ -2192 +2195 @@
      */
     $name_matches = get_terms(
-        $taxonomy,
         array(
+            'taxonomy'               => $taxonomy,
             'name'                   => $name,
             'hide_empty'             => false,
@@ -2220 +2223 @@
             if ( is_taxonomy_hierarchical( $taxonomy ) ) {
                 $siblings = get_terms(
-                    $taxonomy,
                     array(
+                        'taxonomy'               => $taxonomy,
                         'get'                    => 'all',
                         'parent'                 => $parent,
@@ -3471 +3474 @@
     $children = array();
     $terms    = get_terms(
-        $taxonomy,
         array(
+            'taxonomy'               => $taxonomy,
             'get'                    => 'all',
             'orderby'                => 'id',