Make WordPress Core

Ticket #33887: 33887.patch

File 33887.patch, 1.4 KB (added by akibjorklund, 9 years ago)
  • wp-admin/network/upgrade.php

     
    6363                echo "<ul>";
    6464                foreach ( (array) $blogs as $details ) {
    6565                        switch_to_blog( $details['blog_id'] );
    66                         $siteurl = site_url();
    67                         $upgrade_url = admin_url( 'upgrade.php?step=upgrade_db' );
     66                        $siteurl = site_url( '', 'original' );
     67                        $upgrade_url = admin_url( 'upgrade.php?step=upgrade_db', 'original' );
    6868                        restore_current_blog();
    6969
    7070                        echo "<li>$siteurl</li>";
  • wp-includes/link-template.php

     
    33353335 * @since 3.4.0
    33363336 *
    33373337 * @param string $url    Absolute url that includes a scheme
    3338  * @param string $scheme Optional. Scheme to give $url. Currently 'http', 'https', 'login', 'login_post', 'admin', or 'relative'.
     3338 * @param string $scheme Optional. Scheme to give $url. Currently 'http', 'https', 'login', 'login_post', 'admin', 'relative' or 'original'.
    33393339 * @return string $url URL with chosen scheme.
    33403340 */
    33413341function set_url_scheme( $url, $scheme = null ) {
     3342        if ( 'original' === $scheme ) {
     3343                return $url;
     3344        }
     3345
    33423346        $orig_scheme = $scheme;
    33433347
    33443348        if ( ! $scheme ) {