Changeset 37677

Timestamp:

06/10/2016 06:55:33 PM (9 years ago)

Author:

DrewAPicture

Message:

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.

Location:

trunk/src/wp-includes

Files:

• functions.php (modified) (1 diff)
• load.php (modified) (1 diff)

trunk/src/wp-includes/functions.php

@@ -4054 +4054 @@
 
 /**
- * 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.
  *

trunk/src/wp-includes/load.php

@@ -950 +950 @@
     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;
+}