Ticket #34413: 34413.3.diff

src/wp-includes/taxonomy-functions.php

@@ -442 +442 @@
         unset( $args['capabilities'] );
 
         $args['name'] = $taxonomy;
-        $args['object_type'] = array_unique( (array) $object_type );
 
+        if ( isset( $wp_taxonomies[ $taxonomy ] ) ) {
+                $args['object_type'] = array_merge( $wp_taxonomies[ $taxonomy ]->object_type, (array) $object_type );
+        } else {
+                $args['object_type'] = (array) $object_type;
+        }
+
+        $args['object_type'] = array_unique( $args['object_type'] );
+
         $args['labels'] = get_taxonomy_labels( (object) $args );
         $args['label'] = $args['labels']->name;
 

tests/phpunit/tests/taxonomy.php

@@ -251 +251 @@
                 $this->assertEqualSets( $expected, $tax->object_type );
         }
 
+        /**
+         * @ticket 34413
+         */
+        public function test_register_taxonomy_subsequent_calls_should_not_overwrite_previously_registered_object_types() {
+                register_taxonomy( 'wptests_tax', 'post' );
+                register_taxonomy( 'wptests_tax', 'page' );
+
+                $tax = get_taxonomy( 'wptests_tax' );
+
+                $expected = array( 'post', 'page' );
+                $this->assertEqualSets( $expected, $tax->object_type );
+        }
+
         public function test_get_objects_in_term_should_return_invalid_taxonomy_error() {
                 $terms = get_objects_in_term( 1, 'invalid_taxonomy' );
                 $this->assertInstanceOf( 'WP_Error', $terms );