Ticket #14991: 14991.3.diff

wp-includes/rewrite.php

@@ -1550 +1550 @@
                 $page_rewrite = apply_filters('page_rewrite_rules', $page_rewrite);
 
                 // Extra permastructs
+                $permastruct_rewrite = array();
                 foreach ( $this->extra_permastructs as $permastructname => $permastruct ) {
                         if ( is_array($permastruct) )
                                 $rules = $this->generate_rewrite_rules($permastruct[0], $permastruct[1]);
@@ -1560 +1561 @@
                         if ( 'post_tag' == $permastructname )
                                 $rules = apply_filters('tag_rewrite_rules', $rules);
 
-                        $this->extra_rules_top = array_merge($this->extra_rules_top, $rules);
+                        $permastruct_rewrite = array_merge($permastruct_rewrite, $rules);
                 }
 
                 // Put them together.
                 if ( $this->use_verbose_page_rules )
-                        $this->rules = array_merge($this->extra_rules_top, $robots_rewrite, $default_feeds, $registration_pages, $page_rewrite, $root_rewrite, $comments_rewrite, $search_rewrite,  $author_rewrite, $date_rewrite, $post_rewrite, $this->extra_rules);
+                        $this->rules = $this->extra_rules_top + $permastruct_rewrite + $robots_rewrite + $default_feeds + $registration_pages + $page_rewrite + $root_rewrite + $comments_rewrite + $search_rewrite +  $author_rewrite + $date_rewrite + $post_rewrite + $this->extra_rules;
                 else
-                        $this->rules = array_merge($this->extra_rules_top, $robots_rewrite, $default_feeds, $registration_pages, $root_rewrite, $comments_rewrite, $search_rewrite,  $author_rewrite, $date_rewrite, $post_rewrite, $page_rewrite, $this->extra_rules);
+                        $this->rules = $this->extra_rules_top + $permastruct_rewrite + $robots_rewrite + $default_feeds + $registration_pages + $root_rewrite + $comments_rewrite + $search_rewrite +  $author_rewrite + $date_rewrite + $post_rewrite + $page_rewrite + $this->extra_rules;
 
                 do_action_ref_array('generate_rewrite_rules', array(&$this));
                 $this->rules = apply_filters('rewrite_rules_array', $this->rules);