Ticket #35844: 35844.1.patch

src/wp-includes/functions.php

@@ -3946 +3946 @@
 }
 
 /**
- * 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.
  *
  * @since 2.6.0

src/wp-includes/load.php

@@ -894 +894 @@
 
         return (bool) $installing;
 }
+
+/**
+ * Determine if SSL is used.
+ *
+ * @since 2.6.0
+ * @since 4.5.0 Moved from functions.php to load.php
+ *
+ * @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;
+}