Ticket #18991: 18991.matches.diff

wp-includes/rewrite.php

@@ -314 +314 @@
 
                 if ( preg_match("!^$match!", $request_match, $matches) ) {
 
-                        if ( $wp_rewrite->use_verbose_page_rules && preg_match( '/pagename=\$([^&\[]+)\[([0-9]+)\]/', $query, $varmatch ) ) {
+                        if ( $wp_rewrite->use_verbose_page_rules && preg_match( '/pagename=\$matches\[([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]] ) )
+                                if ( ! get_page_by_path( $matches[ $varmatch[1] ] ) )
                                         continue;
                         }
 

wp-includes/class-wp.php

@@ -201 +201 @@
                                         if ( preg_match("#^$match#", $request_match, $matches) ||
                                                 preg_match("#^$match#", urldecode($request_match), $matches) ) {
 
-                                                if ( $wp_rewrite->use_verbose_page_rules && preg_match( '/pagename=\$([^&\[]+)\[([0-9]+)\]/', $query, $varmatch ) ) {
+                                                if ( $wp_rewrite->use_verbose_page_rules && preg_match( '/pagename=\$matches\[([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]] ) )
+                                                        if ( ! get_page_by_path( $matches[ $varmatch[1] ] ) )
                                                                 continue;
                                                 }