Ticket #36188: 36188.3.diff

src/wp-includes/class-wp-post-type.php

@@ -470 +470 @@
                         }
                 }
 
-                if ( false !== $args['rewrite'] && ( is_admin() || '' != get_option( 'permalink_structure' ) ) ) {
+                if ( false !== $args['rewrite'] && ( is_admin() || wp_installing() || '' != get_option( 'permalink_structure' ) ) ) {
                         if ( ! is_array( $args['rewrite'] ) ) {
                                 $args['rewrite'] = array();
                         }
@@ -535 +535 @@
                         $wp->add_query_var( $this->query_var );
                 }
 
-                if ( false !== $this->rewrite && ( is_admin() || '' != get_option( 'permalink_structure' ) ) ) {
+                if ( false !== $this->rewrite && ( is_admin() || wp_installing() || '' != get_option( 'permalink_structure' ) ) ) {
                         if ( $this->hierarchical ) {
                                 add_rewrite_tag( "%$this->name%", '(.+?)', $this->query_var ? "{$this->query_var}=" : "post_type=$this->name&pagename=" );
                         } else {

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

@@ -275 +275 @@
                         $args['query_var'] = false;
                 }
 
-                if ( false !== $args['rewrite'] && ( is_admin() || '' != get_option( 'permalink_structure' ) ) ) {
+                if ( false !== $args['rewrite'] && ( is_admin() || wp_installing() || '' != get_option( 'permalink_structure' ) ) ) {
                         $args['rewrite'] = wp_parse_args( $args['rewrite'], array(
                                 'with_front'   => true,
                                 'hierarchical' => false,
@@ -360 +360 @@
                         $wp->add_query_var( $this->query_var );
                 }
 
-                if ( false !== $this->rewrite && ( is_admin() || '' != get_option( 'permalink_structure' ) ) ) {
+                if ( false !== $this->rewrite && ( is_admin() || wp_installing() || '' != get_option( 'permalink_structure' ) ) ) {
                         if ( $this->hierarchical && $this->rewrite['hierarchical'] ) {
                                 $tag = '(.+?)';
                         } else {