Changeset 14108 for trunk/wp-includes/taxonomy.php

Timestamp:

04/16/2010 02:08:58 PM (15 years ago)

Author:

nacin

Message:

Introduce the wp_filter_object_list() helper, with an $operator arg. Fixes an intersection bug in get_post_types() and get_taxonomies(). Also switches $operator default from 'or' to 'and' for get_post_stati(). props scribu, fixes #12966.

File:

• trunk/wp-includes/taxonomy.php (modified) (1 diff)

trunk/wp-includes/taxonomy.php

@@ -68 +68 @@
  * @see register_taxonomy
  *
- * @param array $args An array of key => value arguments to match against the taxonomies.
- *  Only taxonomies having attributes that match all arguments are returned.
+ * @param array $args An array of key => value arguments to match against the taxonomy objects.
  * @param string $output The type of output to return, either taxonomy 'names' or 'objects'. 'names' is the default.
+ * @param string $operator The logical operation to perform. 'or' means only one element 
+ *  from the array needs to match; 'and' means all elements must match. The default is 'and'.
  * @return array A list of taxonomy names or objects
  */
-function get_taxonomies( $args = array(), $output = 'names' ) {
+function get_taxonomies( $args = array(), $output = 'names', $operator = 'and' ) {
     global $wp_taxonomies;
 
-    $taxonomies = array();
-    foreach ( (array) $wp_taxonomies as $taxname => $taxobj )
-        if ( empty($args) || array_intersect_assoc((array) $taxobj, $args) )
-            $taxonomies[$taxname] = $taxobj;
-
-    if ( 'names' == $output )
-        return array_keys($taxonomies);
-
-    return $taxonomies;
-}
+    $field = ('names' == $output) ? 'name' : false;
+
+    return wp_filter_object_list($wp_taxonomies, $args, $operator, $field);
+}
+
 
 /**