From c22f156a8a8cd16802e4f73f456bdbdb46483485 Mon Sep 17 00:00:00 2001
From: dd32 <dd32@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Tue, 29 Jun 2010 23:54:39 +0000
Subject: [PATCH] And the rest of r15353. See #14147

git-svn-id: http://svn.automattic.com/wordpress/trunk@15354 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/functions.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index 8826aa8005..3b7cf1a04e 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -27,16 +27,15 @@ function mysql2date( $dateformatstring, $mysqlstring, $translate = true ) {
 	if ( empty( $m ) )
 		return false;
 
-	if ( 'G' == $dateformatstring ) {
+	if ( 'G' == $dateformatstring )
 		return strtotime( $m . ' +0000' );
-	}
 
 	$i = strtotime( $m );
 
 	if ( 'U' == $dateformatstring )
 		return $i;
 
-	if ( $translate)
+	if ( $translate )
 		return date_i18n( $dateformatstring, $i );
 	else
 		return date( $dateformatstring, $i );