Ticket #36399: 36399.diff

src/wp-includes/taxonomy.php

@@ -2182 +2182 @@
 }
 
 /**
- * Count how many terms are in Taxonomy.
+ * Count how many terms are in a specific taxonomy or how many terms exist at all.
  *
  * Default $args is 'hide_empty' which can be 'hide_empty=true' or array('hide_empty' => true).
  *
+ * Prior to 4.6.0, the first parameter of `wp_count_terms()` was a taxonomy or list of taxonomies:
+ *
+ *     $terms = wp_count_terms( 'post_tag', array(
+ *         'hide_empty' => false,
+ *     ) );
+ *
+ * Since 4.6.0, taxonomies should be passed via the 'taxonomy' argument in the `$args` array:
+ *
+ *     $terms = wp_count_terms( array(
+ *         'taxonomy' => 'post_tag',
+ *         'hide_empty' => false,
+ *     ) );
+ *
  * @since 2.3.0
+ * @since 4.6.0 Changed the function signature so that the `$args` array can be provided as the first parameter.
  *
- * @param string       $taxonomy Taxonomy name.
- * @param array|string $args     Optional. Array of arguments that get passed to {@see get_terms()}.
- *                               Default empty array.
+ * @param array|string $args       Optional. Array of arguments that get passed to {@see get_terms()}.
+ *                                 Default empty array.
+ * @param array        $deprecated Argument array, when using the legacy function parameter format. If present, this
+ *                                 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 Number of terms in that taxonomy or WP_Error if the taxonomy does not exist.
  */
-function wp_count_terms( $taxonomy, $args = array() ) {
+function wp_count_terms( $args = array(), $deprecated = '' ) {
         $defaults = array('hide_empty' => false);
+
+        $is_sequential = count( array_filter( array_keys( (array) $args ), 'is_int' ) ) === count( (array) $args );
+        $do_legacy_args = $deprecated || $is_sequential;
+
+        if ( $do_legacy_args ) {
+                $deprecated['taxonomy'] = (array) $args;
+                $args = $deprecated;
+        }
+
         $args = wp_parse_args($args, $defaults);
 
         // backwards compatibility
@@ -2205 +2230 @@
 
         $args['fields'] = 'count';
 
-        return get_terms($taxonomy, $args);
+        return get_terms( $args );
 }
 
 /**