Ticket #19876: 19876.diff

wp-includes/rewrite.php

@@ -816 +816 @@
                 // the extra .? at the beginning prevents clashes with other regular expressions in the rules array
                 $this->add_rewrite_tag( '%pagename%', '(.?.+?)', 'pagename=' );
 
-                return $this->generate_rewrite_rules( $this->get_page_permastruct(), EP_PAGES );
+                return $this->generate_rewrite_rules( $this->get_page_permastruct(), EP_PAGES, false, true, false, false );
         }
 
         /**
@@ -1489 +1489 @@
                 }
 
                 // Post
-                $post_rewrite = $this->generate_rewrite_rules($this->permalink_structure, EP_PERMALINK);
-                $post_rewrite = apply_filters('post_rewrite_rules', $post_rewrite);
+                $post_rewrite = $this->generate_rewrite_rules( $this->permalink_structure, EP_PERMALINK, false, true, false, false );
+                $post_rewrite = apply_filters( 'post_rewrite_rules', $post_rewrite );
 
                 // Date
-                $date_rewrite = $this->generate_rewrite_rules($this->get_date_permastruct(), EP_DATE);
-                $date_rewrite = apply_filters('date_rewrite_rules', $date_rewrite);
+                $date_rewrite = $this->generate_rewrite_rules( $this->get_date_permastruct(), EP_DATE );
+                $date_rewrite = apply_filters( 'date_rewrite_rules', $date_rewrite );
 
                 // Root
-                $root_rewrite = $this->generate_rewrite_rules($this->root . '/', EP_ROOT);
-                $root_rewrite = apply_filters('root_rewrite_rules', $root_rewrite);
+                $root_rewrite = $this->generate_rewrite_rules( $this->root . '/', EP_ROOT );
+                $root_rewrite = apply_filters( 'root_rewrite_rules', $root_rewrite );
 
                 // Comments
-                $comments_rewrite = $this->generate_rewrite_rules($this->root . $this->comments_base, EP_COMMENTS, true, true, true, false);
-                $comments_rewrite = apply_filters('comments_rewrite_rules', $comments_rewrite);
+                $comments_rewrite = $this->generate_rewrite_rules( $this->root . $this->comments_base, EP_COMMENTS, true, true, true, false );
+                $comments_rewrite = apply_filters( 'comments_rewrite_rules', $comments_rewrite );
 
                 // Search
-                $search_structure = $this->get_search_permastruct();
-                $search_rewrite = $this->generate_rewrite_rules($search_structure, EP_SEARCH);
-                $search_rewrite = apply_filters('search_rewrite_rules', $search_rewrite);
+                $search_rewrite = $this->generate_rewrite_rules( $this->get_search_permastruct(), EP_SEARCH );
+                $search_rewrite = apply_filters( 'search_rewrite_rules', $search_rewrite );
 
                 // Authors
-                $author_rewrite = $this->generate_rewrite_rules($this->get_author_permastruct(), EP_AUTHORS);
-                $author_rewrite = apply_filters('author_rewrite_rules', $author_rewrite);
+                $author_rewrite = $this->generate_rewrite_rules( $this->get_author_permastruct(), EP_AUTHORS );
+                $author_rewrite = apply_filters( 'author_rewrite_rules', $author_rewrite );
 
                 // Pages
                 $page_rewrite = $this->page_rewrite_rules();
-                $page_rewrite = apply_filters('page_rewrite_rules', $page_rewrite);
+                $page_rewrite = apply_filters( 'page_rewrite_rules', $page_rewrite );
 
                 // Extra permastructs
                 foreach ( $this->extra_permastructs as $permastructname => $permastruct ) {
-                        if ( is_array($permastruct) )
-                                $rules = $this->generate_rewrite_rules($permastruct[0], $permastruct[1]);
+                        if ( is_array( $permastruct ) )
+                                $rules = $this->generate_rewrite_rules( $permastruct[0], $permastruct[1] );
                         else
-                                $rules = $this->generate_rewrite_rules($permastruct, EP_NONE);
+                                $rules = $this->generate_rewrite_rules( $permastruct, EP_NONE );
 
-                        $rules = apply_filters($permastructname . '_rewrite_rules', $rules);
+                        $rules = apply_filters( $permastructname . '_rewrite_rules', $rules );
                         if ( 'post_tag' == $permastructname )
-                                $rules = apply_filters('tag_rewrite_rules', $rules);
+                                $rules = apply_filters( 'tag_rewrite_rules', $rules );
 
-                        $this->extra_rules_top = array_merge($this->extra_rules_top, $rules);
+                        $this->extra_rules_top = array_merge( $this->extra_rules_top, $rules );
                 }
 
                 // Put them together.