Changeset 17226

Timestamp:

01/06/2011 03:59:22 AM (16 years ago)

Author:

ryan

Message:

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

File:

• trunk/wp-includes/rewrite.php (modified) (2 diffs)

trunk/wp-includes/rewrite.php

@@ -1898 +1898 @@
                 if ( $this->using_index_permalinks() )
                         $this->root = $this->index . '/';
-
                 unset($this->author_structure);
                 unset($this->date_structure);
@@ -1905 +1904 @@
                 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;
         }