Changeset 32709

Timestamp:

06/08/2015 07:44:32 PM (10 years ago)

Author:

boonebgorges

Message:

Filter out empty object_types in register_taxonomy_for_object_type().

This prevents weird edge bugs when registering an existing taxonomy with an
object type when the taxonomy was previously associated with no object types.

Fixes #32590.

Location:

trunk

Files:

• src/wp-includes/taxonomy.php (modified) (1 diff)
• tests/phpunit/tests/taxonomy.php (modified) (1 diff)

trunk/src/wp-includes/taxonomy.php

@@ -537 +537 @@
     if ( ! in_array( $object_type, $wp_taxonomies[$taxonomy]->object_type ) )
         $wp_taxonomies[$taxonomy]->object_type[] = $object_type;
+
+    // Filter out empties.
+    $wp_taxonomies[ $taxonomy ]->object_type = array_filter( $wp_taxonomies[ $taxonomy ]->object_type );
 
     return true;

trunk/tests/phpunit/tests/taxonomy.php

@@ -239 +239 @@
 
     }
+
+    /**
+     * @ticket 32590
+     */
+    public function test_register_taxonomy_for_post_type_for_taxonomy_with_no_object_type_should_filter_out_empty_object_types() {
+        register_taxonomy( 'wptests_tax', '' );
+        register_taxonomy_for_object_type( 'wptests_tax', 'post' );
+        $tax = get_taxonomy( 'wptests_tax' );
+
+        $expected = array( 'post' );
+        $this->assertEqualSets( $expected, $tax->object_type );
+    }
+
     /**
      * @ticket 25706