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

File:

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

trunk/wp-includes/functions.php

@@ -80 +80 @@
  * The 'timestamp' type will return the current timestamp.
  *
- * 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.
+ * 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.
  *
  * @since 1.0.0
  *
  * @param string $type Either 'mysql' or 'timestamp'.
- * @param int|bool $gmt Optional. Whether to use GMT timezone. Default is false.
+ * @param int|bool $gmt Optional. Whether to use $gmt offset. Default is false.
  * @return int|string String if $type is 'gmt', int if $type is 'timestamp'.
  */
@@ -2805 +2805 @@
  */
 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;
+    return ( isset($_SERVER['HTTPS']) && 'on' == strtolower($_SERVER['HTTPS']) ) ? true : false;
 }
 
@@ -2906 +2898 @@
  * @return object The cloned 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;
+function wp_clone($object) {
+    return version_compare(phpversion(), '5.0') < 0 ? $object : clone($object);
 }