Ticket #33887: 33887.patch

wp-admin/network/upgrade.php

@@ -63 +63 @@
                 echo "<ul>";
                 foreach ( (array) $blogs as $details ) {
                         switch_to_blog( $details['blog_id'] );
-                        $siteurl = site_url();
-                        $upgrade_url = admin_url( 'upgrade.php?step=upgrade_db' );
+                        $siteurl = site_url( '', 'original' );
+                        $upgrade_url = admin_url( 'upgrade.php?step=upgrade_db', 'original' );
                         restore_current_blog();
 
                         echo "<li>$siteurl</li>";

wp-includes/link-template.php

@@ -3335 +3335 @@
  * @since 3.4.0
  *
  * @param string $url    Absolute url that includes a scheme
- * @param string $scheme Optional. Scheme to give $url. Currently 'http', 'https', 'login', 'login_post', 'admin', or 'relative'.
+ * @param string $scheme Optional. Scheme to give $url. Currently 'http', 'https', 'login', 'login_post', 'admin', 'relative' or 'original'.
  * @return string $url URL with chosen scheme.
  */
 function set_url_scheme( $url, $scheme = null ) {
+        if ( 'original' === $scheme ) {
+                return $url;
+        }
+
         $orig_scheme = $scheme;
 
         if ( ! $scheme ) {