Ticket #16932: 16932-hotfix-path-mapping.patch

wp-includes/functions.php

@@ -1389 +1389 @@
  */
 function add_query_arg() {
         $ret = '';
+
+        // reduce path in REQUEST_URI for auto-URIs.
+        // Ticket #16932
+        $request = $_SERVER['REQUEST_URI'];
+        ( ( $query = (string) strstr($request, '?') ) || true)
+                && '.php' === substr( $request, -strlen($query) - 4, -strlen($query) )
+                && $request = basename( $request )
+                ;
+
         if ( is_array( func_get_arg(0) ) ) {
                 if ( @func_num_args() < 2 || false === @func_get_arg( 1 ) )
-                        $uri = $_SERVER['REQUEST_URI'];
+                        $uri = $request;
                 else
                         $uri = @func_get_arg( 1 );
         } else {
                 if ( @func_num_args() < 3 || false === @func_get_arg( 2 ) )
-                        $uri = $_SERVER['REQUEST_URI'];
+                        $uri = $request;
                 else
                         $uri = @func_get_arg( 2 );
         }