mirror of
https://github.com/WordPress/WordPress.git
synced 2024-12-23 01:27:36 +01:00
In get_home_url()
, import the $pagenow
global to avoid having to check if it exists before comparing against it.
Props KalenJohnson. See #33545. Built from https://develop.svn.wordpress.org/trunk@33736 git-svn-id: http://core.svn.wordpress.org/trunk@33704 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
93f745fd9b
commit
d8752c191d
@ -2732,6 +2732,8 @@ function home_url( $path = '', $scheme = null ) {
|
||||
* @return string Home URL link with optional path appended.
|
||||
*/
|
||||
function get_home_url( $blog_id = null, $path = '', $scheme = null ) {
|
||||
global $pagenow;
|
||||
|
||||
$orig_scheme = $scheme;
|
||||
|
||||
if ( empty( $blog_id ) || !is_multisite() ) {
|
||||
@ -2743,7 +2745,7 @@ function get_home_url( $blog_id = null, $path = '', $scheme = null ) {
|
||||
}
|
||||
|
||||
if ( ! in_array( $scheme, array( 'http', 'https', 'relative' ) ) ) {
|
||||
if ( is_ssl() && ! is_admin() && 'wp-login.php' !== $GLOBALS['pagenow'] )
|
||||
if ( is_ssl() && ! is_admin() && 'wp-login.php' !== $pagenow )
|
||||
$scheme = 'https';
|
||||
else
|
||||
$scheme = parse_url( $url, PHP_URL_SCHEME );
|
||||
|
@ -4,7 +4,7 @@
|
||||
*
|
||||
* @global string $wp_version
|
||||
*/
|
||||
$wp_version = '4.4-alpha-33735';
|
||||
$wp_version = '4.4-alpha-33736';
|
||||
|
||||
/**
|
||||
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
|
||||
|
Loading…
Reference in New Issue
Block a user