Changeset 40083

Timestamp:

02/20/2017 06:15:07 AM (8 years ago)

Author:

dd32

Message:

Taxonomy: Disallow overriding the name property when registering a taxonomy.

Props wpfo for initial patch, swissspidy.
Merges [40049] to the 4.7 branch.
Fixes #39308.

Location:

branches/4.7

Files:

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

branches/4.7/src/wp-includes/class-wp-taxonomy.php

@@ -334 +334 @@
         }
 
+        $args['name'] = $this->name;
+
         foreach ( $args as $property_name => $property_value ) {
             $this->$property_name = $property_value;

branches/4.7/tests/phpunit/tests/taxonomy.php

@@ -711 +711 @@
     }
 
+    /**
+     * @ticket 39308
+     */
+    public function test_taxonomy_name_property_should_not_get_overridden_by_passed_args() {
+        register_taxonomy( 'foo', 'post', array( 'name' => 'bar' ) );
+
+        $taxonomy = get_taxonomy( 'foo' );
+        unregister_taxonomy( 'foo' );
+
+        $this->assertSame( 'foo', $taxonomy->name );
+    }
 }