Index: wp-includes/functions.php
===================================================================
--- wp-includes/functions.php	(revision 11001)
+++ wp-includes/functions.php	(working copy)
@@ -88,10 +88,7 @@
 	$i = $unixtimestamp;
 	// Sanity check for PHP 5.1.0-
 	if ( false === $i || intval($i) < 0 ) {
-		if ( ! $gmt )
-			$i = current_time( 'timestamp' );
-		else
-			$i = time();
+		$i = current_time( 'timestamp', $gmt );
 		// we should not let date() interfere with our
 		// specially computed timestamp
 		$gmt = true;