Ticket #6357: 6357-multitype.diff

wp-includes/taxonomy.php

@@ -34 +34 @@
  *
  * @uses $wp_taxonomies
  *
- * @param string $object_type Name of the type of taxonomy object
+ * @param array|string $object_type Name of the type of taxonomy object
  * @return array The names of all taxonomy of $object_type.
  */
 function get_object_taxonomies($object_type) {
@@ -42 +42 @@
 
         $taxonomies = array();
         foreach ( $wp_taxonomies as $taxonomy ) {
-                if ( $object_type === $taxonomy->object_type )
+                if ( in_array($object_type, (array) $taxonomy->object_type) )
                         $taxonomies[] = $taxonomy->name;
         }
 
@@ -141 +141 @@
  * @uses $wp_taxonomies Inserts new taxonomy object into the list
  *
  * @param string $taxonomy Name of taxonomy object
- * @param string $object_type Name of the object type for the taxonomy object.
+ * @param array|string $object_type Name of the object type for the taxonomy object.
  * @param array|string $args See above description for the two keys values.
  */
 function register_taxonomy( $taxonomy, $object_type, $args = array() ) {
@@ -1556 +1556 @@
  *      Passes, function params in same order.
  *
  * @param int|array $object_ids Single or list of term object ID(s)
- * @param string $object_type The taxonomy object type
+ * @param array|string $object_type The taxonomy object type
  */
 function clean_object_term_cache($object_ids, $object_type) {
         if ( !is_array($object_ids) )
@@ -1652 +1652 @@
  * @uses wp_get_object_terms() Used to get terms from the database to update
  *
  * @param string|array $object_ids Single or list of term object ID(s)
- * @param string $object_type The taxonomy object type
+ * @param array|string $object_type The taxonomy object type
  * @return null|bool Null value is given with empty $object_ids. False if
  */
 function update_object_term_cache($object_ids, $object_type) {