sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

And the rest of r15353. See #14147 

git-svn-id: https://develop.svn.wordpress.org/trunk@15354 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Dion Hulse 2010-06-29 23:54:39 +00:00
parent d12bd7a07e
commit 3562ac632d
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wp-includes/functions.php
View File

@ -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 );