Changeset 25617

Timestamp:

09/25/2013 12:46:39 AM (13 years ago)

Author:

nacin

Message:

Clean up the path calculations in wp::parse_request().

props evansolomon for initial cleanup.
fixes #22209.

File:

• trunk/src/wp-includes/class-wp.php (modified) (1 diff)

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

@@ -142 +142 @@
                         $this->did_permalink = true;
 
-                        if ( isset($_SERVER['PATH_INFO']) )
-                                $pathinfo = $_SERVER['PATH_INFO'];
-                        else
-                                $pathinfo = '';
-                        $pathinfo_array = explode('?', $pathinfo);
-                        $pathinfo = str_replace("%", "%25", $pathinfo_array[0]);
-                        $req_uri = $_SERVER['REQUEST_URI'];
-                        $req_uri_array = explode('?', $req_uri);
-                        $req_uri = $req_uri_array[0];
+                        $pathinfo = isset( $_SERVER['PATH_INFO'] ) ? $_SERVER['PATH_INFO'] : '';
+                        list( $pathinfo ) = explode( '?', $pathinfo );
+                        $pathinfo = str_replace( "%", "%25", $pathinfo );
+
+                        list( $req_uri ) = explode( '?', $_SERVER['REQUEST_URI'] );
                         $self = $_SERVER['PHP_SELF'];
-                        $home_path = parse_url(home_url());
-                        if ( isset($home_path['path']) )
-                                $home_path = $home_path['path'];
-                        else
-                                $home_path = '';
-                        $home_path = trim($home_path, '/');
+                        $home_path = trim( parse_url( home_url(), PHP_URL_PATH ), '/' );
 
                         // Trim path info from the end and the leading home path from the