Ticket #19148: taxonomy.php.patch

wp-includes/taxonomy.php

@@ -354 +354 @@
         unset( $args['capabilities'] );
 
         $args['name'] = $taxonomy;
-        $args['object_type'] =  array_unique( (array)$object_type );
+        $args['object_type'] =  array();
 
         $args['labels'] = get_taxonomy_labels( (object) $args );
         $args['label'] = $args['labels']->name;
 
         $wp_taxonomies[$taxonomy] = (object) $args;
 
+        foreach (array_unique( (array)$object_type ) as $type){
+        register_taxonomy_for_object_type($taxonomy, $type);
+    }
+
         // register callback handling for metabox
         add_filter('wp_ajax_add-' . $taxonomy, '_wp_ajax_add_hierarchical_term');
 
@@ -432 +436 @@
  * @return bool True if successful, false if not
  */
 function register_taxonomy_for_object_type( $taxonomy, $object_type) {
-        global $wp_taxonomies;
+        global $wp_taxonomies, $wp_post_types;
 
         if ( !isset($wp_taxonomies[$taxonomy]) )
                 return false;
@@ -440 +444 @@
         if ( ! get_post_type_object($object_type) )
                 return false;
 
-        if ( ! in_array( $object_type, $wp_taxonomies[$taxonomy]->object_type ) )
+        if ( ! in_array( $object_type, $wp_taxonomies[$taxonomy]->object_type ) ){
                 $wp_taxonomies[$taxonomy]->object_type[] = $object_type;
+        $wp_post_types[$object_type]->taxonomies[] = $taxonomy;
+    }
 
         return true;
 }