Ticket #30438: 30438.2.diff

src/wp-includes/class-wp.php

@@ -157 +157 @@
                         list( $req_uri ) = explode( '?', $_SERVER['REQUEST_URI'] );
                         $self = $_SERVER['PHP_SELF'];
                         $home_path = trim( parse_url( home_url(), PHP_URL_PATH ), '/' );
+                        $home_path_escaped = preg_quote( $home_path, '|' );
 
                         // Trim path info from the end and the leading home path from the
                         // front. For path info requests, this leaves us with the requesting
@@ -164 +165 @@
                         // requested permalink.
                         $req_uri = str_replace($pathinfo, '', $req_uri);
                         $req_uri = trim($req_uri, '/');
-                        $req_uri = preg_replace("|^$home_path|i", '', $req_uri);
+                        $req_uri = preg_replace( "|^$home_path_escaped|i", '', $req_uri );
                         $req_uri = trim($req_uri, '/');
                         $pathinfo = trim($pathinfo, '/');
-                        $pathinfo = preg_replace("|^$home_path|i", '', $pathinfo);
+                        $pathinfo = preg_replace( "|^$home_path_escaped|i", '', $pathinfo );
                         $pathinfo = trim($pathinfo, '/');
                         $self = trim($self, '/');
-                        $self = preg_replace("|^$home_path|i", '', $self);
+                        $self = preg_replace( "|^$home_path_escaped|i", '', $self );
                         $self = trim($self, '/');
 
                         // The requested permalink is in $pathinfo for path info requests and

tests/phpunit/tests/rewrite.php

@@ -6 +6 @@
  * @group rewrite
  */
 class Tests_Rewrite extends WP_UnitTestCase {
+        private $home_url;
 
         function setUp() {
                 global $wp_rewrite;
@@ -18 +19 @@
                 create_initial_taxonomies();
 
                 $wp_rewrite->flush_rules();
+
+                $this->home_url = get_option( 'home' );
         }
 
         function tearDown() {
@@ -24 +27 @@
                 global $wp_rewrite;
                 $wp_rewrite->init();
 
+                update_option( 'home', $this->home_url );
                 parent::tearDown();
         }
 
@@ -74 +78 @@
                 $this->assertEquals( 0, url_to_postid( '/example-page/ex/' ) );
         }
 
+        function test_parse_request_home_path() {
+                $home_url = home_url( '/path/' );
+                update_option( 'home', $home_url );
+
+                $this->go_to( $home_url );
+                $this->assertEquals( array(), $GLOBALS['wp']->query_vars );
+
+                $this->go_to( $home_url . 'page');
+                $this->assertEquals( array('page' => '', 'pagename' => 'page'), $GLOBALS['wp']->query_vars );
+        }
+
+        function test_parse_request_home_path_with_regexchar() {
+                $home_url = home_url( '/pa+th/' );
+                update_option( 'home', $home_url );
+
+                $this->go_to( $home_url );
+                $this->assertEquals( array(), $GLOBALS['wp']->query_vars );
+
+                $this->go_to( $home_url . 'page');
+                $this->assertEquals( array('page' => '', 'pagename' => 'page'), $GLOBALS['wp']->query_vars );
+        }
+
         function test_url_to_postid_dupe_path() {
                 update_option( 'home', home_url('/example/') );