Boostrap: Move `is_ssl()` to wp-includes/load.php.
Moving to load.php introduces parity with other commonly evaluated `is_*()` functions such as `is_admin()` or `is_multisite()`. It also makes `is_ssl()` available much earlier in the loading process, such as for use in drop-ins like advanced-cache.php. Props johnjamesjacoby. Fixes #35844. Built from https://develop.svn.wordpress.org/trunk@37677 git-svn-id: http://core.svn.wordpress.org/trunk@37643 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
820d7174c2
commit
2600c28169
|
@ -4052,25 +4052,6 @@ function validate_file( $file, $allowed_files = '' ) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Determine if SSL is used.
|
|
||||||
*
|
|
||||||
* @since 2.6.0
|
|
||||||
*
|
|
||||||
* @return bool True if SSL, false if not used.
|
|
||||||
*/
|
|
||||||
function is_ssl() {
|
|
||||||
if ( isset($_SERVER['HTTPS']) ) {
|
|
||||||
if ( 'on' == strtolower($_SERVER['HTTPS']) )
|
|
||||||
return true;
|
|
||||||
if ( '1' == $_SERVER['HTTPS'] )
|
|
||||||
return true;
|
|
||||||
} elseif ( isset($_SERVER['SERVER_PORT']) && ( '443' == $_SERVER['SERVER_PORT'] ) ) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Whether to force SSL used for the Administration Screens.
|
* Whether to force SSL used for the Administration Screens.
|
||||||
*
|
*
|
||||||
|
|
|
@ -949,3 +949,26 @@ function wp_installing( $is_installing = null ) {
|
||||||
|
|
||||||
return (bool) $installing;
|
return (bool) $installing;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Determines if SSL is used.
|
||||||
|
*
|
||||||
|
* @since 2.6.0
|
||||||
|
* @since 4.6.0 Moved from functions.php to load.php
|
||||||
|
*
|
||||||
|
* @return bool True if SSL, otherwise false.
|
||||||
|
*/
|
||||||
|
function is_ssl() {
|
||||||
|
if ( isset( $_SERVER['HTTPS'] ) ) {
|
||||||
|
if ( 'on' == strtolower( $_SERVER['HTTPS'] ) ) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( '1' == $_SERVER['HTTPS'] ) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
} elseif ( isset($_SERVER['SERVER_PORT'] ) && ( '443' == $_SERVER['SERVER_PORT'] ) ) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
*
|
*
|
||||||
* @global string $wp_version
|
* @global string $wp_version
|
||||||
*/
|
*/
|
||||||
$wp_version = '4.6-alpha-37676';
|
$wp_version = '4.6-alpha-37677';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 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.
|
||||||
|
|
Loading…
Reference in New Issue