Ticket #48223: 48223.diff

wp-includes/class-wp.php

@@ -66 +66 @@
          */
         public $matched_rule;
 
+        /**
+         * Array of matched rules to loop over.
+         *
+         * @since x.x.x
+         * @var string[]
+         */
+        public $matched_rules;
+
+        /**
+         * Array of all potential matched rules found.
+         *
+         * @since x.x.x
+         * @var string[]
+         */
+        public $all_matched_rules;
+
         /**
          * Rewrite query the request matched.
          *
@@ -205 +221 @@
 
                         // Look for matches.
                         $request_match = $requested_path;
+
+                        if ( empty($this->all_matched_rules) ){
+                                $this->all_matched_rules = array();
+                                $this->matched_rules = $this->all_matched_rules;
+                        }
+
                         if ( empty( $request_match ) ) {
                                 // An empty request could only match against ^$ regex
                                 if ( isset( $rewrite['$'] ) ) {
-                                        $this->matched_rule = '$';
+                                        $this->all_matched_rules[] = '$';
                                         $query              = $rewrite['$'];
                                         $matches            = array( '' );
                                 }
-                        } else {
+                        } else if ( empty( $this->all_matched_rules ) ){
                                 foreach ( (array) $rewrite as $match => $query ) {
                                         // If the requested file is the anchor of the match, prepend it to the path info.
                                         if ( ! empty( $requested_file ) && strpos( $match, $requested_file ) === 0 && $requested_file != $requested_path ) {
@@ -236 +258 @@
                                                         }
                                                 }
 
-                                                // Got a match.
-                                                $this->matched_rule = $match;
-                                                break;
+                                                // Got a match - add to matched_rules array.
+                                                $this->all_matched_rules[] = array(
+                                                        'matches' => $matches,
+                                                        'match' => $match,
+                                                        'query' => $query,
+                                                );
                                         }
+                                        $this->matched_rules = $this->all_matched_rules;
                                 }
                         }
 
+                        // we set $this->matched_rule here
+                        if (! empty($this->matched_rules)){
+                                $pop = reset($this->matched_rules);
+                                array_shift($this->matched_rules);
+        
+                                $this->matched_rule = $pop['match'];
+                                $query = $pop['query'];
+                                $matches = $pop['matches'];
+                        }
+
                         if ( isset( $this->matched_rule ) ) {
                                 // Trim the query of everything up to the '?'.
                                 $query = preg_replace( '!^.+\?!', '', $query );
@@ -718 +754 @@
                 nocache_headers();
         }
 
+        /**
+         * Try to parse another rule/query that matches our request.
+         * 
+         * @since x.x.x
+         */
+        function maybe_try_another_matched_rule($preemt, $wp_query){
+                
+                if ( empty($wp_query->posts) && !empty($this->matched_rules) ){
+                        
+                        // there is some redundancy here - no need to re-parse $_SERVER etc.
+                        // but we do need to try parsing another matched rule and query
+                        $this->parse_request();
+                        $this->query_posts();
+                        $this->handle_404();
+                }
+
+                return false;
+        }
+
         /**
          * Sets up all of the variables required by the WordPress environment.
          *
@@ -730 +785 @@
          * @param string|array $query_args Passed to parse_request().
          */
         public function main( $query_args = '' ) {
+
+                add_action( 'pre_handle_404', array($this, 'maybe_try_another_matched_rule'), 10, 2 );
+
                 $this->init();
                 $this->parse_request( $query_args );
                 $this->send_headers();