Ticket #18877: 18877.2.diff

src/wp-includes/class-wp-rewrite.php

@@ -1900 +1900 @@
         }
 
         /**
+         * Go through a list of rewrite rules and find a match.
+         *
+         * @since 3.3.0
+         * @access private
+         *
+         * @param $request
+         * @param $req_uri
+         * @param array $rewrite Rewrite pairs (regex matches and rewritten query strings).
+         */
+        public function find_match( $request, $req_uri, $rewrite ) {
+                $found_match = false;
+                // Look for matches.
+                $request_match = $request;
+                if ( empty( $request_match ) ) {
+                        // An empty request could only match against ^$ regex
+                        if ( isset( $rewrite['$'] ) ) {
+                                $this->matched_rule = '$';
+                                $query = $rewrite['$'];
+                                $matches = array('');
+                        }
+                } else {
+                        foreach ( (array) $rewrite as $match => $query ) {
+                                // If the requesting file is the anchor of the match, prepend it to the path info.
+                                if ( ! empty($req_uri) && strpos($match, $req_uri) === 0 && $req_uri != $request )
+                                        $request_match = $req_uri . '/' . $request;
+
+                                if ( preg_match("#^$match#", $request_match, $matches) ||
+                                        preg_match("#^$match#", urldecode($request_match), $matches) ) {
+
+                                        if ( $this->use_verbose_page_rules && preg_match( '/pagename=\$matches\[([0-9]+)\]/', $query, $varmatch ) ) {
+                                                // This is a verbose page match, let's check to be sure about it.
+                                                $page = get_page_by_path( $matches[ $varmatch[1] ] );
+                                                if ( ! $page ) {
+                                                        continue;
+                                                }
+
+                                                $post_status_obj = get_post_status_object( $page->post_status );
+                                                if ( ! $post_status_obj->public && ! $post_status_obj->protected
+                                                        && ! $post_status_obj->private && $post_status_obj->exclude_from_search ) {
+                                                        continue;
+                                                }
+                                        }
+
+                                        // Got a match.
+                                        $found_match = true;
+                                        break;
+                                }
+                        }
+                }
+
+                if ( $found_match ) {
+                        // Trim the query of everything up to the '?'.
+                        $query = preg_replace("!^.+\?!", '', $query);
+
+                        // Substitute the substring matches into the query.
+                        $query = addslashes(WP_MatchesMapRegex::apply($query, $matches));
+
+                        return array( $match, $query );
+                } else {
+                        return false;
+                }
+        }
+
+        /**
          * Constructor - Calls init(), which runs setup.
          *
          * @since 1.5.0

src/wp-includes/class-wp.php

@@ -189 +189 @@
 
                         $this->request = $request;
 
-                        // Look for matches.
-                        $request_match = $request;
-                        if ( empty( $request_match ) ) {
-                                // An empty request could only match against ^$ regex
-                                if ( isset( $rewrite['$'] ) ) {
-                                        $this->matched_rule = '$';
-                                        $query = $rewrite['$'];
-                                        $matches = array('');
-                                }
-                        } else {
-                                foreach ( (array) $rewrite as $match => $query ) {
-                                        // If the requesting file is the anchor of the match, prepend it to the path info.
-                                        if ( ! empty($req_uri) && strpos($match, $req_uri) === 0 && $req_uri != $request )
-                                                $request_match = $req_uri . '/' . $request;
+                        $result = $wp_rewrite->find_match( $request, $req_uri, $rewrite );
 
-                                        if ( preg_match("#^$match#", $request_match, $matches) ||
-                                                preg_match("#^$match#", urldecode($request_match), $matches) ) {
+                        if ( $result ) {
+                                $this->matched_rule = $result[0];
+                                $this->matched_query = $result[1];
 
-                                                if ( $wp_rewrite->use_verbose_page_rules && preg_match( '/pagename=\$matches\[([0-9]+)\]/', $query, $varmatch ) ) {
-                                                        // This is a verbose page match, let's check to be sure about it.
-                                                        $page = get_page_by_path( $matches[ $varmatch[1] ] );
-                                                        if ( ! $page ) {
-                                                                continue;
-                                                        }
-
-                                                        $post_status_obj = get_post_status_object( $page->post_status );
-                                                        if ( ! $post_status_obj->public && ! $post_status_obj->protected
-                                                                && ! $post_status_obj->private && $post_status_obj->exclude_from_search ) {
-                                                                continue;
-                                                        }
-                                                }
-
-                                                // Got a match.
-                                                $this->matched_rule = $match;
-                                                break;
-                                        }
-                                }
-                        }
-
-                        if ( isset( $this->matched_rule ) ) {
-                                // Trim the query of everything up to the '?'.
-                                $query = preg_replace("!^.+\?!", '', $query);
-
-                                // Substitute the substring matches into the query.
-                                $query = addslashes(WP_MatchesMapRegex::apply($query, $matches));
-
-                                $this->matched_query = $query;
-
                                 // Parse the query.
-                                parse_str($query, $perma_query_vars);
+                                parse_str($this->matched_query, $perma_query_vars);
 
                                 // If we're processing a 404 request, clear the error var since we found something.
                                 if ( '404' == $error )

src/wp-includes/rewrite.php

@@ -497 +497 @@
         }
 
         // Look for matches.
-        $request_match = $request;
-        foreach ( (array)$rewrite as $match => $query) {
+        $result = $wp_rewrite->find_match( $request, $url, $rewrite );
+        if ( $result ) {
+                // Got a match.
+                $match = $result[0];
+                $query = $result[1];
 
-                // If the requesting file is the anchor of the match, prepend it
-                // to the path info.
-                if ( !empty($url) && ($url != $request) && (strpos($match, $url) === 0) )
-                        $request_match = $url . '/' . $request;
-
-                if ( preg_match("#^$match#", $request_match, $matches) ) {
-
-                        if ( $wp_rewrite->use_verbose_page_rules && preg_match( '/pagename=\$matches\[([0-9]+)\]/', $query, $varmatch ) ) {
-                                // This is a verbose page match, let's check to be sure about it.
-                                $page = get_page_by_path( $matches[ $varmatch[1] ] );
-                                if ( ! $page ) {
-                                        continue;
+                // Filter out non-public query vars
+                global $wp;
+                parse_str( $query, $query_vars );
+                $query = array();
+                foreach ( (array) $query_vars as $key => $value ) {
+                        if ( in_array( $key, $wp->public_query_vars ) ){
+                                $query[$key] = $value;
+                                if ( isset( $post_type_query_vars[$key] ) ) {
+                                        $query['post_type'] = $post_type_query_vars[$key];
+                                        $query['name'] = $value;
                                 }
-
-                                $post_status_obj = get_post_status_object( $page->post_status );
-                                if ( ! $post_status_obj->public && ! $post_status_obj->protected
-                                        && ! $post_status_obj->private && $post_status_obj->exclude_from_search ) {
-                                        continue;
-                                }
                         }
+                }
 
-                        // Got a match.
-                        // Trim the query of everything up to the '?'.
-                        $query = preg_replace("!^.+\?!", '', $query);
+                // Resolve conflicts between posts with numeric slugs and date archive queries.
+                $query = wp_resolve_numeric_slug_conflicts( $query );
 
-                        // Substitute the substring matches into the query.
-                        $query = addslashes(WP_MatchesMapRegex::apply($query, $matches));
-
-                        // Filter out non-public query vars
-                        global $wp;
-                        parse_str( $query, $query_vars );
-                        $query = array();
-                        foreach ( (array) $query_vars as $key => $value ) {
-                                if ( in_array( $key, $wp->public_query_vars ) ){
-                                        $query[$key] = $value;
-                                        if ( isset( $post_type_query_vars[$key] ) ) {
-                                                $query['post_type'] = $post_type_query_vars[$key];
-                                                $query['name'] = $value;
-                                        }
-                                }
-                        }
-
-                        // Resolve conflicts between posts with numeric slugs and date archive queries.
-                        $query = wp_resolve_numeric_slug_conflicts( $query );
-
-                        // Do the query
-                        $query = new WP_Query( $query );
-                        if ( ! empty( $query->posts ) && $query->is_singular )
-                                return $query->post->ID;
-                        else
-                                return 0;
-                }
+                // Do the query
+                $query = new WP_Query( $query );
+                if ( ! empty( $query->posts ) && $query->is_singular )
+                        return $query->post->ID;
+                else
+                        return 0;
         }
         return 0;
 }