WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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:
Scott Taylor 2015-08-25 21:03:20 +00:00
parent 93f745fd9b
commit d8752c191d
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/link-template.php
View File

@ -2732,6 +2732,8 @@ function home_url( $path = '', $scheme = null ) {
* @return string Home URL link with optional path appended. * @return string Home URL link with optional path appended.
*/ */
function get_home_url( $blog_id = null, $path = '', $scheme = null ) { function get_home_url( $blog_id = null, $path = '', $scheme = null ) {
global $pagenow;
$orig_scheme = $scheme; $orig_scheme = $scheme;
if ( empty( $blog_id ) || !is_multisite() ) { 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 ( ! 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'; $scheme = 'https';
else else
$scheme = parse_url( $url, PHP_URL_SCHEME ); $scheme = parse_url( $url, PHP_URL_SCHEME );

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @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. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.