Changeset 37356

Timestamp:

05/03/2016 07:35:20 PM (8 years ago)

Author:

ericlewis

Message:

Rewrite Rules: Add self-describing variables to rewrite matcher.

The rewrite rule matching code in WP::parse_request() used an unclear variable $request to represent the requested path (e.g. "2016/05/03") as well as a deceptively named variable $request_uri, which actually represents the requested file when an install used PATHINFO links.

Those variables are replaced with $requested_path and $requested_file respectively for clarity.

Fixes #36674.

File:

• trunk/src/wp-includes/class-wp.php (modified) (4 diffs)

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

@@ -57 +57 @@
 
     /**
-     * Permalink or requested URI.
+     * The request path, e.g. `2015/05/06`.
      *
      * @since 2.0.0
@@ -203 +203 @@
             //  $req_uri for other requests.
             if ( ! empty($pathinfo) && !preg_match('|^.*' . $wp_rewrite->index . '$|', $pathinfo) ) {
-                $request = $pathinfo;
+                $requested_path = $pathinfo;
             } else {
                 // If the request uri is the index, blank it out so that we don't try to match it against a rule.
                 if ( $req_uri == $wp_rewrite->index )
                     $req_uri = '';
-                $request = $req_uri;
-            }
-
-            $this->request = $request;
+                $requested_path = $req_uri;
+            }
+            $requested_file = $req_uri;
+
+            $this->request = $requested_path;
 
             // Look for matches.
-            $request_match = $request;
+            $request_match = $requested_path;
             if ( empty( $request_match ) ) {
                 // An empty request could only match against ^$ regex
@@ -224 +225 @@
             } 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 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 )
+                        $request_match = $requested_file . '/' . $requested_path;
 
                     if ( preg_match("#^$match#", $request_match, $matches) ||
@@ -270 +271 @@
 
             // If req_uri is empty or if it is a request for ourself, unset error.
-            if ( empty($request) || $req_uri == $self || strpos($_SERVER['PHP_SELF'], 'wp-admin/') !== false ) {
+            if ( empty($requested_path) || $requested_file == $self || strpos($_SERVER['PHP_SELF'], 'wp-admin/') !== false ) {
                 unset( $error, $_GET['error'] );