Changeset 25483

Timestamp:

09/18/2013 08:38:53 PM (13 years ago)

Author:

wonderboymusic

Message:

Use wp_parse_args() again for $args['rewrite'] in register_taxonomy().

Props SergeyBiryukov.
Fixes #23668.

File:

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

trunk/src/wp-includes/taxonomy.php

@@ -353 +353 @@
 
         if ( false !== $args['rewrite'] && ( is_admin() || '' != get_option( 'permalink_structure' ) ) ) {
-                if ( ! is_array( $args['rewrite'] ) )
-                        $args['rewrite'] = array();
-
-                if ( empty( $args['rewrite']['slug'] ) )
-                        $args['rewrite']['slug'] = sanitize_title_with_dashes( $taxonomy );
-
-                $args['rewrite'] = array_merge( array(
+                $args['rewrite'] = wp_parse_args( $args['rewrite'], array(
                         'with_front' => true,
                         'hierarchical' => false,
                         'ep_mask' => EP_NONE,
-                ), $args['rewrite'] );
+                ) );
+
+                if ( empty( $args['rewrite']['slug'] ) )
+                        $args['rewrite']['slug'] = sanitize_title_with_dashes( $taxonomy );
 
                 if ( $args['hierarchical'] && $args['rewrite']['hierarchical'] )