Ticket #30373: 30373.2.diff

src/wp-includes/formatting.php

@@ -3239 +3239 @@
  * @return string Absolute path.
  */
 function wp_make_link_relative( $link ) {
-        return preg_replace( '|https?://[^/]+(/.*)|i', '$1', $link );
+        return preg_replace( '|^(https?:)?\/\/[^/]+(\/.*)|i', '$2', $link );
 }
 
 /**

tests/phpunit/tests/link.php

@@ -256 +256 @@
                 $this->assertEquals( $four, get_adjacent_post( true, array( $exclude ), true ) );
                 $this->assertEmpty( get_adjacent_post( false, array(), false ) );
         }
-}
- No newline at end of file
+
+        public function test_wp_make_link_relative_with_http_scheme() {
+                $link = 'http://example.com/this-is-a-test-http-url/';
+                $relative_link = wp_make_link_relative( $link );
+                $this->assertEquals( '/this-is-a-test-http-url/', $relative_link );
+        }
+
+        public function test_wp_make_link_relative_with_https_scheme() {
+                $link = 'https://example.com/this-is-a-test-https-url/';
+                $relative_link = wp_make_link_relative( $link );
+                $this->assertEquals( '/this-is-a-test-https-url/', $relative_link );
+        }
+
+        // @group 30373
+        public function test_wp_make_link_relative_with_no_scheme() {
+                $link = '//example.com/this-is-a-test-schemeless-url/';
+                $relative_link = wp_make_link_relative( $link );
+                $this->assertEquals( '/this-is-a-test-schemeless-url/', $relative_link ); 
+        }
+
+        public function test_wp_make_link_relative_only_first_scheme() {
+                $link = 'https://example.com/this-is-a-test/?redirect=https://example.org/a-different-test-post/';
+                $relative_link = wp_make_link_relative( $link );
+                $this->assertEquals( '/this-is-a-test/?redirect=https://example.org/a-different-test-post/', $relative_link );
+        }
+}