Changeset 35497

Timestamp:

11/03/2015 09:35:17 PM (11 years ago)

Author:

SergeyBiryukov

Message:

Formatting: wp_make_link_relative() should return an empty string if no path is present in the link.

Props bcworkz, MikeHansenMe, chriscct7, SergeyBiryukov.
Fixes #26819.

Location:

trunk

Files:

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

trunk/src/wp-includes/formatting.php

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

trunk/tests/phpunit/tests/link.php

@@ -305 +305 @@
         }
 
-        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 );
-        }
-
         /**
          * @ticket 30910