Ticket #13957: 13957.diff

wp-includes/taxonomy.php

@@ -281 +281 @@
                 $wp->add_query_var($args['query_var']);
         }
 
-        if ( false !== $args['rewrite'] && '' != get_option('permalink_structure') ) {
+        if ( !empty( $wp_rewrite ) && false !== $args['rewrite'] && '' != get_option('permalink_structure') ) {
                 $args['rewrite'] = wp_parse_args($args['rewrite'], array(
                         'slug' => sanitize_title_with_dashes($taxonomy),
                         'with_front' => true,

wp-includes/post.php

@@ -859 +859 @@
                 $wp->add_query_var($args->query_var);
         }
 
-        if ( false !== $args->rewrite && '' != get_option('permalink_structure') ) {
+        if ( !empty( $wp_rewrite ) && false !== $args->rewrite && '' != get_option('permalink_structure') ) {
                 if ( !is_array($args->rewrite) )
                         $args->rewrite = array();
                 if ( !isset($args->rewrite['slug']) )