Ticket #20750: 20750.2.patch

wp-includes/link-template.php

@@ -1873 +1873 @@
 
         if ( 'relative' == $scheme )
                 $url = preg_replace( '#^.+://[^/]*#', '', $url );
-        elseif ( 'http' != $scheme )
-                $url = str_replace( 'http://', "$scheme://", $url );
+        else
+                $url = str_replace( array( 'http://', 'https://' ), "$scheme://", $url );
 
         if ( !empty( $path ) && is_string( $path ) && strpos( $path, '..' ) === false )
                 $url .= '/' . ltrim( $path, '/' );
@@ -1938 +1938 @@
 
         if ( 'relative' == $scheme )
                 $url = preg_replace( '#^.+://[^/]*#', '', $url );
-        elseif ( 'http' != $scheme )
-                $url = str_replace( 'http://', "{$scheme}://", $url );
+        else
+                $url = str_replace( array( 'http://', 'https://' ), "$scheme://", $url );
 
         if ( !empty( $path ) && is_string( $path ) && strpos( $path, '..' ) === false )
                 $url .= '/' . ltrim( $path, '/' );