WordPress.org

Make WordPress Core

Ticket #16822: 16822.patch

File 16822.patch, 2.0 KB (added by jakub.tyrcha, 3 years ago)
  • wp-includes/general-template.php

     
    404404                case 'siteurl' : // DEPRECATED 
    405405                        _deprecated_argument( __FUNCTION__, '2.2', sprintf( __('The <code>%s</code> option is deprecated for the family of <code>bloginfo()</code> functions.' ), $show ) . ' ' . sprintf( __( 'Use the <code>%s</code> option instead.' ), 'url'  ) ); 
    406406                case 'url' : 
    407                         $output = home_url(); 
     407                        $output = home_url( '', ( force_ssl_admin() || force_ssl_login() ) && !is_ssl() ? 'http' : null ); 
    408408                        break; 
    409409                case 'wpurl' : 
    410                         $output = site_url(); 
     410                        $output = site_url( '', ( force_ssl_admin() || force_ssl_login() ) && !is_ssl() ? 'http' : null ); 
    411411                        break; 
    412412                case 'description': 
    413413                        $output = get_option('blogdescription'); 
  • wp-login.php

     
    8686<?php   if ( !is_multisite() ) { ?> 
    8787<div id="login"><h1><a href="<?php echo apply_filters('login_headerurl', 'http://wordpress.org/'); ?>" title="<?php echo apply_filters('login_headertitle', esc_attr__('Powered by WordPress')); ?>"><?php bloginfo('name'); ?></a></h1> 
    8888<?php   } else { ?> 
    89 <div id="login"><h1><a href="<?php echo apply_filters('login_headerurl', network_home_url() ); ?>" title="<?php echo apply_filters('login_headertitle', esc_attr($current_site->site_name) ); ?>"><span class="hide"><?php bloginfo('name'); ?></span></a></h1> 
     89<div id="login"><h1><a href="<?php echo apply_filters('login_headerurl', network_home_url( '', ( force_ssl_admin() || force_ssl_login() ) && !is_ssl() ? 'http' : null  ) ); ?>" title="<?php echo apply_filters('login_headertitle', esc_attr($current_site->site_name) ); ?>"><span class="hide"><?php bloginfo('name'); ?></span></a></h1> 
    9090<?php   } 
    9191 
    9292        $message = apply_filters('login_message', $message);