Changeset 19017

Timestamp:

10/19/2011 10:49:45 PM (13 years ago)

Author:

nacin

Message:

We know that pagename is being assigned to $matches-something, so skip the variable variable. props duck_. see #18991.

Location:

trunk/wp-includes

Files:

• class-wp.php (modified) (1 diff)
• rewrite.php (modified) (1 diff)

trunk/wp-includes/class-wp.php

@@ -202 +202 @@
                         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;
                         }

trunk/wp-includes/rewrite.php

@@ -315 +315 @@
         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;
             }