Changeset 13597 for trunk/wp-includes/taxonomy.php

Timestamp:

03/06/2010 03:43:23 AM (17 years ago)

Author:

dd32

Message:

Fix double slashing on /index.phptaxonomy/term/ links. Props Scribu. Fixes #12508. Also Fixes #10445

File:

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

trunk/wp-includes/taxonomy.php

@@ -234 +234 @@
 
         if ( false !== $args['rewrite'] && '' != get_option('permalink_structure') ) {
-                if ( !is_array($args['rewrite']) )
-                        $args['rewrite'] = array();
-                if ( !isset($args['rewrite']['slug']) )
-                        $args['rewrite']['slug'] = sanitize_title_with_dashes($taxonomy);
-                if ( !isset($args['rewrite']['with_front']) )
-                        $args['rewrite']['with_front'] = true;
-                $wp_rewrite->add_rewrite_tag("%$taxonomy%", '([^/]+)', $args['query_var'] ? "{$args['query_var']}=" : "taxonomy=$taxonomy&term=$term");
-                $wp_rewrite->add_permastruct($taxonomy, "/{$args['rewrite']['slug']}/%$taxonomy%", $args['rewrite']['with_front']);
+                $args['rewrite'] = wp_parse_args($args['rewrite'], array( 
+                        'slug' => sanitize_title_with_dashes($taxonomy), 
+                        'with_front' => true, 
+                )); 
+                $wp_rewrite->add_rewrite_tag("%$taxonomy%", '([^/]+)', $args['query_var'] ? "{$args['query_var']}=" : "taxonomy=$taxonomy&term="); 
+                $wp_rewrite->add_permastruct($taxonomy, "{$args['rewrite']['slug']}/%$taxonomy%", $args['rewrite']['with_front']); 
         }