WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

And the rest of r15353. See #14147 

git-svn-id: http://svn.automattic.com/wordpress/trunk@15354 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
dd32 2010-06-29 23:54:39 +00:00
parent 1c986a3e88
commit c22f156a8a
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 );