From 8feaf39b4d3dda938ccdad0dd06177f6a19a2af4 Mon Sep 17 00:00:00 2001 From: scribu Date: Wed, 27 Oct 2010 00:25:03 +0000 Subject: [PATCH] Don't trigger verbose page rules if permalink begins with fixed string. Fixes #9824 git-svn-id: http://svn.automattic.com/wordpress/trunk@15987 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/rewrite.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/wp-includes/rewrite.php b/wp-includes/rewrite.php index 418cc7484..96e56f9fb 100644 --- a/wp-includes/rewrite.php +++ b/wp-includes/rewrite.php @@ -1904,19 +1904,17 @@ class WP_Rewrite { $this->root = ''; if ( $this->using_index_permalinks() ) $this->root = $this->index . '/'; + unset($this->author_structure); unset($this->date_structure); unset($this->page_structure); unset($this->search_structure); unset($this->feed_structure); unset($this->comment_feed_structure); + $this->use_trailing_slashes = ( '/' == substr($this->permalink_structure, -1, 1) ); - // Enable generic rules for pages if permalink structure doesn't begin with a wildcard. - if ( preg_match("/^[^%]*%(?:postname|category|tag|author)%/", $this->permalink_structure) ) - $this->use_verbose_page_rules = true; - else - $this->use_verbose_page_rules = false; + $this->use_verbose_page_rules = preg_match( "#^/%(postname|category|tag|author)%#", $this->permalink_structure ); } /**