Revert [15987] [15988] [15989]. Props SergeyBiryukov. see #9824 fixes #16041

git-svn-id: http://svn.automattic.com/wordpress/trunk@17226 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2011-01-06 03:59:22 +00:00
parent 02d663acb4
commit 1d6b027adc

View File

@ -1897,17 +1897,19 @@ 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) );
$this->use_verbose_page_rules = (bool) preg_match( "#^/%(postname|category|tag|author)%#", $this->permalink_structure );
// 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;
}
/**