Don't add UTC offset again when formatting 'U' in mysql2date. Props masquerade. fixes #2537

git-svn-id: https://develop.svn.wordpress.org/trunk@3633 602fd350-edb4-49c9-b593-d223f7449a82
2006-03-07 21:24:49 +00:00 · 2006-03-07 21:24:49 +00:00 · 20c6baad57
parent 9da2338021
commit 20c6baad57
1 changed files with 3 additions and 0 deletions
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@ -23,6 +23,9 @@ function mysql2date($dateformatstring, $mysqlstring, $translate = true) {
 	}
 	$i = mktime(substr($m,11,2),substr($m,14,2),substr($m,17,2),substr($m,5,2),substr($m,8,2),substr($m,0,4));

+	if( 'U' == $dateformatstring )
+		return $i;
+	
 	if ( -1 == $i || false == $i )
 		$i = 0;