Ticket #23284: 23284.diff

wp-includes/functions.php

@@ -655 +655 @@
         else
                 $frag = '';
 
-        if ( 0 === stripos( 'http://', $uri ) ) {
-                $protocol = 'http://';
-                $uri = substr( $uri, 7 );
-        } elseif ( 0 === stripos( 'https://', $uri ) ) {
-                $protocol = 'https://';
-                $uri = substr( $uri, 8 );
-        } else {
-                $protocol = '';
-        }
-
         if ( strpos( $uri, '?' ) !== false ) {
                 $parts = explode( '?', $uri, 2 );
                 if ( 1 == count( $parts ) ) {
@@ -674 +664 @@
                         $base = $parts[0] . '?';
                         $query = $parts[1];
                 }
-        } elseif ( $protocol || strpos( $uri, '=' ) === false ) {
+        } elseif ( strpos( $uri, '=' ) === false ) {
                 $base = $uri . '?';
                 $query = '';
         } else {
@@ -699 +689 @@
         $ret = build_query( $qs );
         $ret = trim( $ret, '?' );
         $ret = preg_replace( '#=(&|$)#', '$1', $ret );
-        $ret = $protocol . $base . $ret . $frag;
+        $ret = $base . $ret . $frag;
         $ret = rtrim( $ret, '?' );
         return $ret;
 }