Changes from trunk/wp-includes/functions.php at r10150 to branches/2.7/wp-includes/functions.php at r10491

File:

• branches/2.7/wp-includes/functions.php (modified) (3 diffs)

branches/2.7/wp-includes/functions.php

@@ -80 +80 @@
  * The 'timestamp' type will return the current timestamp.
  *
- * If the $gmt is set to either '1' or 'true', then both types will use the
- * GMT offset in the WordPress option to add the GMT offset to the time.
+ * If $gmt is set to either '1' or 'true', then both types will use GMT time.
+ * if $gmt is false, the output is adjusted with the GMT offset in the WordPress option.
  *
  * @since 1.0.0
  *
  * @param string $type Either 'mysql' or 'timestamp'.
- * @param int|bool $gmt Optional. Whether to use $gmt offset. Default is false.
+ * @param int|bool $gmt Optional. Whether to use GMT timezone. Default is false.
  * @return int|string String if $type is 'gmt', int if $type is 'timestamp'.
  */
@@ -2805 +2805 @@
  */
 function is_ssl() {
-    return ( isset($_SERVER['HTTPS']) && 'on' == strtolower($_SERVER['HTTPS']) ) ? true : false;
+    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;
 }
 
@@ -2898 +2906 @@
  * @return object The cloned object
  */
-function wp_clone($object) {
-    return version_compare(phpversion(), '5.0') < 0 ? $object : clone($object);
+function wp_clone( $object ) {
+    static $can_clone;
+    if ( !isset( $can_clone ) ) {
+        $can_clone = version_compare( phpversion(), '5.0', '>=' );
+    }
+    return $can_clone ? clone( $object ) : $object;
 }