From 2ecc414b32e8609e40c1498a183c63412127e443 Mon Sep 17 00:00:00 2001 From: dd32 Date: Sat, 6 Mar 2010 03:43:23 +0000 Subject: [PATCH] Fix double slashing on /index.php//taxonomy/term/ links. Props Scribu. Fixes #12508. Also Fixes #10445 git-svn-id: http://svn.automattic.com/wordpress/trunk@13597 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/taxonomy.php | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/wp-includes/taxonomy.php b/wp-includes/taxonomy.php index 39ca1c4631..7fbe619676 100644 --- a/wp-includes/taxonomy.php +++ b/wp-includes/taxonomy.php @@ -233,14 +233,12 @@ function register_taxonomy( $taxonomy, $object_type, $args = array() ) { } 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']); } if ( is_null($args['show_ui']) )