WordPress.org

Make WordPress Core

Changeset 19017


Ignore:
Timestamp:
10/19/11 22:49:45 (3 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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-includes/class-wp.php

    r18995 r19017  
    202202                        preg_match("#^$match#", urldecode($request_match), $matches) ) { 
    203203 
    204                         if ( $wp_rewrite->use_verbose_page_rules && preg_match( '/pagename=\$([^&\[]+)\[([0-9]+)\]/', $query, $varmatch ) ) { 
     204                        if ( $wp_rewrite->use_verbose_page_rules && preg_match( '/pagename=\$matches\[([0-9]+)\]/', $query, $varmatch ) ) { 
    205205                            // this is a verbose page match, lets check to be sure about it 
    206                             if ( ! get_page_by_path( ${$varmatch[1]}[$varmatch[2]] ) ) 
     206                            if ( ! get_page_by_path( $matches[ $varmatch[1] ] ) ) 
    207207                                continue; 
    208208                        } 
  • trunk/wp-includes/rewrite.php

    r18715 r19017  
    315315        if ( preg_match("!^$match!", $request_match, $matches) ) { 
    316316 
    317             if ( $wp_rewrite->use_verbose_page_rules && preg_match( '/pagename=\$([^&\[]+)\[([0-9]+)\]/', $query, $varmatch ) ) { 
     317            if ( $wp_rewrite->use_verbose_page_rules && preg_match( '/pagename=\$matches\[([0-9]+)\]/', $query, $varmatch ) ) { 
    318318                // this is a verbose page match, lets check to be sure about it 
    319                 if ( ! get_page_by_path( ${$varmatch[1]}[$varmatch[2]] ) ) 
     319                if ( ! get_page_by_path( $matches[ $varmatch[1] ] ) ) 
    320320                    continue; 
    321321            } 
Note: See TracChangeset for help on using the changeset viewer.