Ticket #33547: 33547.diff

src/wp-includes/formatting.php

@@ -2304 +2304 @@
          * @param string $img        Filename for the smiley image.
          * @param string $site_url   Site URL, as returned by site_url().
          */
-        $src_url = apply_filters( 'smilies_src', includes_url( "images/smilies/$img" ), $img, site_url() );
+        $src_url = apply_filters( 'smilies_src', includes_url( "images/smilies/$img", 'none' ), $img, site_url() );
 
         return sprintf( '<img src="%s" alt="%s" class="wp-smiley" style="height: 1em; max-height: 1em;" />', esc_url( $src_url ), esc_attr( $smiley ) );
 }

src/wp-includes/link-template.php

@@ -3159 +3159 @@
 
         if ( ! $scheme ) {
                 $scheme = is_ssl() ? 'https' : 'http';
-        } elseif ( $scheme === 'admin' || $scheme === 'login' || $scheme === 'login_post' || $scheme === 'rpc' ) {
+        } elseif ( in_array( $scheme, array( 'admin', 'login', 'login_post', 'rpc' ) ) ) {
                 $scheme = is_ssl() || force_ssl_admin() ? 'https' : 'http';
-        } elseif ( $scheme !== 'http' && $scheme !== 'https' && $scheme !== 'relative' ) {
+        } elseif ( ! in_array( $scheme, array( 'http', 'https', 'relative', 'none' ) ) ) {
                 $scheme = is_ssl() ? 'https' : 'http';
         }
 
         $url = trim( $url );
-        if ( substr( $url, 0, 2 ) === '//' )
+        if ( substr( $url, 0, 2 ) === '//' && 'none' !== $scheme )
                 $url = 'http:' . $url;
 
         if ( 'relative' == $scheme ) {
@@ -3173 +3173 @@
                 $url = ltrim( preg_replace( '#^\w+://[^/]*#', '', $url ) );
                 if ( $url !== '' && $url[0] === '/' )
                         $url = '/' . ltrim($url , "/ \t\n\r\0\x0B" );
+        } elseif ( 'none' === $scheme ) {
+                $url = preg_replace( '#^\w+://#', '//', $url );
         } else {
                 $url = preg_replace( '#^\w+://#', $scheme . '://', $url );
         }

tests/phpunit/tests/url.php

@@ -425 +425 @@
                                 call_user_func( $function, null, 'something...here' ) );
                 }
         }
+
+        public function test_set_url_scheme_none() {
+                $home_host = parse_url( home_url(), PHP_URL_HOST );
+                $this->assertEquals( '//' . $home_host, set_url_scheme( home_url(), 'none' ) );
+
+                $site_host = parse_url( site_url(), PHP_URL_HOST );
+                $this->assertEquals( '//' . $site_host, set_url_scheme( site_url(), 'none' ) );
+
+                $schemeless_includes = '//' . $site_host . '/' . WPINC . '/';
+                $this->assertEquals( $schemeless_includes, set_url_scheme( includes_url(), 'none' ) );
+        }
 }