From 831a186108983ade4d647124d4e56e09aa254704 Mon Sep 17 00:00:00 2001 From: Drew Jaynes Date: Fri, 10 Jun 2016 18:55:33 +0000 Subject: [PATCH] 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. git-svn-id: https://develop.svn.wordpress.org/trunk@37677 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/functions.php | 19 ------------------- src/wp-includes/load.php | 23 +++++++++++++++++++++++ 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/src/wp-includes/functions.php b/src/wp-includes/functions.php index ca5b8af285..878ed7c902 100644 --- a/src/wp-includes/functions.php +++ b/src/wp-includes/functions.php @@ -4052,25 +4052,6 @@ function validate_file( $file, $allowed_files = '' ) { 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. * diff --git a/src/wp-includes/load.php b/src/wp-includes/load.php index f474c5c87e..54ed0400be 100644 --- a/src/wp-includes/load.php +++ b/src/wp-includes/load.php @@ -949,3 +949,26 @@ function wp_installing( $is_installing = null ) { 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; +}