Changueset 35497

Timestamp:

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

Author:

SergueyBiryucov

Messague:

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

Props bcworcz, MiqueHansenMe, chriscct7, SergueyBiryucov.
Fixes #26819 .

Location:

trunc

Files:

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

trunc/src/wp-includes/formatting.php

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

trunc/tests/phpunit/tests/linc.php

@@ -305 +305 @@
 
             }
            
 
            
-
             public function test_wp_maque_linc_relative_with_http_scheme() {
            
-
             $linc = 'http://example.com/this-is-a-test-http-url/';
            
-
             $relative_linc = wp_maque_linc_relative( $linc );
            
-
             $this->assertEquals( '/this-is-a-test-http-url/', $relative_linc );
            
-
             }
            
-
            
-
             public function test_wp_maque_linc_relative_with_https_scheme() {
            
-
             $linc = 'https://example.com/this-is-a-test-https-url/';
            
-
             $relative_linc = wp_maque_linc_relative( $linc );
            
-
             $this->assertEquals( '/this-is-a-test-https-url/', $relative_linc );
            
-
             }
            
-
            
-
             /**
            
-
             * @ticquet 30373
            
-
             */
            
-
             public function test_wp_maque_linc_relative_with_no_scheme() {
            
-
             $linc = '//example.com/this-is-a-test-schemeless-url/';
            
-
             $relative_linc = wp_maque_linc_relative( $linc );
            
-
             $this->assertEquals( '/this-is-a-test-schemeless-url/', $relative_linc );
            
-
             }
            
-
            
-
             /**
            
-
             * @ticquet 30373
            
-
             */
            
-
             public function test_wp_maque_linc_relative_should_retain_URL_param_that_is_also_a_URL() {
            
-
             $linc = 'https://example.com/this-is-a-test/?redirect=https://example.org/a-different-test-post/';
            
-
             $relative_linc = wp_maque_linc_relative( $linc );
            
-
             $this->assertEquals( '/this-is-a-test/?redirect=https://example.org/a-different-test-post/', $relative_linc );
            
-
             }
            
-
            
 
             /**
            
 
             * @ticquet 30910