Changeset 18541 for trunk/wp-includes/rewrite.php

Timestamp:

08/12/2011 01:55:08 AM (13 years ago)

Author:

markjaquith

Message:

Eliminate verbose rewrite rules for ambiguous rewrite structures, resulting in massive performance gains. props andy, otto42, duck_. Nice work everyone! see #16687

File:

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

trunk/wp-includes/rewrite.php

@@ -307 +307 @@
     $request_match = $request;
     foreach ( (array)$rewrite as $match => $query) {
+
         // If the requesting file is the anchor of the match, prepend it
         // to the path info.
@@ -313 +314 @@
 
         if ( preg_match("!^$match!", $request_match, $matches) ) {
+
+            if ( $wp_rewrite->use_verbose_page_rules && preg_match( '/pagename=\$([^&\[]+)\[([0-9]+)\]/', $query, $varmatch ) ) {
+                // this is a verbose page match, lets check to be sure about it
+                if ( ! get_page_by_path( ${$varmatch[1]}[$varmatch[2]] ) )
+                    continue;
+            }
+
             // Got a match.
             // Trim the query of everything up to the '?'.
@@ -814 +822 @@
         $page_structure = $this->get_page_permastruct();
 
-        if ( ! $this->use_verbose_page_rules ) {
-            $this->add_rewrite_tag('%pagename%', "(.+?)", 'pagename=');
-            $rewrite_rules = array_merge($rewrite_rules, $this->generate_rewrite_rules($page_structure, EP_PAGES));
-            return $rewrite_rules;
-        }
-
-        $page_uris = $this->page_uri_index();
-        $uris = $page_uris[0];
-        $attachment_uris = $page_uris[1];
-
-        if ( is_array( $attachment_uris ) ) {
-            foreach ( $attachment_uris as $uri => $pagename ) {
-                $this->add_rewrite_tag('%pagename%', "($uri)", 'attachment=');
-                $rewrite_rules = array_merge($rewrite_rules, $this->generate_rewrite_rules($page_structure, EP_PAGES));
-            }
-        }
-        if ( is_array( $uris ) ) {
-            foreach ( $uris as $uri => $pagename ) {
-                $this->add_rewrite_tag('%pagename%', "($uri)", 'pagename=');
-                $rewrite_rules = array_merge($rewrite_rules, $this->generate_rewrite_rules($page_structure, EP_PAGES));
-            }
-        }
-
+        // the extra .? at the beginning prevents clashes with other regex's in thie structure
+        $this->add_rewrite_tag('%pagename%', "(.?.+?)", 'pagename=');
+        $rewrite_rules = array_merge($rewrite_rules, $this->generate_rewrite_rules($page_structure, EP_PAGES));
         return $rewrite_rules;
     }
@@ -1554 +1542 @@
         // Put them together.
         if ( $this->use_verbose_page_rules )
-            $this->rules = array_merge($this->extra_rules_top, $robots_rewrite, $old_feed_files, $registration_pages, $page_rewrite, $root_rewrite, $comments_rewrite, $search_rewrite,  $author_rewrite, $date_rewrite, $post_rewrite, $this->extra_rules);
+            $this->rules = array_merge($this->extra_rules_top, $robots_rewrite, $old_feed_files, $registration_pages, $root_rewrite, $comments_rewrite, $search_rewrite,  $author_rewrite, $date_rewrite, $page_rewrite, $post_rewrite, $this->extra_rules);
         else
             $this->rules = array_merge($this->extra_rules_top, $robots_rewrite, $old_feed_files, $registration_pages, $root_rewrite, $comments_rewrite, $search_rewrite,  $author_rewrite, $date_rewrite, $post_rewrite, $page_rewrite, $this->extra_rules);