Changeset 30383

Timestamp:

11/19/2014 01:52:57 AM (12 years ago)

Author:

boonebgorges

Message:

Improvements to wp_make_link_relative().

• Support relative URL input.
• When the URL being made relative has another URL as a parameter, don't make the second URL relative.

Props voldemortensen.
Fixes #30373.

Location:

trunk

Files:

• src/wp-includes/formatting.php (modified) (1 diff)
• tests/phpunit/tests/link.php (modified) (1 diff)

trunk/src/wp-includes/formatting.php

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

trunk/tests/phpunit/tests/link.php

@@ -257 +257 @@
                 $this->assertEmpty( get_adjacent_post( false, array(), false ) );
         }
+
+        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 );
+        }
+
+        /**
+         * @ticket 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 );
+        }
+
+        /**
+         * @ticket 30373
+         */
+        public function test_wp_make_link_relative_should_retain_URL_param_that_is_also_a_URL() {
+                $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 );
+        }
 }