Ticket #13318: 13318.get-terms-custom-arg-3.diff

wp-includes/taxonomy.php

@@ -1129 +1129 @@
  * The 'parent' argument is different from 'child_of' in that a term X is considered a 'parent'
  * of term Y only if term X is the father of term Y, not its grandfather or great-grandfather, etc.
  *
+ * The 'custom_cache_key' argument, if set to true, will use all arguments passed in $args to
+ * generate the cache key. Only recognized arguments will be used if it is set to false.
+ * Its default value is false.
+ *
  * @package WordPress
  * @subpackage Taxonomy
  * @since 2.3.0
@@ -1161 +1165 @@
                 'hide_empty' => true, 'exclude' => array(), 'exclude_tree' => array(), 'include' => array(),
                 'number' => '', 'fields' => 'all', 'slug' => '', 'parent' => '',
                 'hierarchical' => true, 'child_of' => 0, 'get' => '', 'name__like' => '',
-                'pad_counts' => false, 'offset' => '', 'search' => '');
+                'pad_counts' => false, 'offset' => '', 'search' => '', 'custom_cache_key' => false );
         $args = wp_parse_args( $args, $defaults );
         $args['number'] = absint( $args['number'] );
         $args['offset'] = absint( $args['offset'] );
@@ -1195 +1199 @@
                         return $empty_array;
         }
 
-        // $args can be whatever, only use the args defined in defaults to compute the key
+        $prefix = ( $args['custom_cache_key'] ) ? $args : $defaults;
+        unset( $prefix['custom_cache_key'] );
         $filter_key = ( has_filter('list_terms_exclusions') ) ? serialize($GLOBALS['wp_filter']['list_terms_exclusions']) : '';
-        $key = md5( serialize( compact(array_keys($defaults)) ) . serialize( $taxonomies ) . $filter_key );
+        $key = md5( serialize( compact( array_keys( $prefix ) ) ) . serialize( $taxonomies ) . $filter_key );
         $last_changed = wp_cache_get('last_changed', 'terms');
         if ( !$last_changed ) {
                 $last_changed = time();