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:
parent
1c986a3e88
commit
c22f156a8a
|
@ -27,16 +27,15 @@ function mysql2date( $dateformatstring, $mysqlstring, $translate = true ) {
|
||||||
if ( empty( $m ) )
|
if ( empty( $m ) )
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
if ( 'G' == $dateformatstring ) {
|
if ( 'G' == $dateformatstring )
|
||||||
return strtotime( $m . ' +0000' );
|
return strtotime( $m . ' +0000' );
|
||||||
}
|
|
||||||
|
|
||||||
$i = strtotime( $m );
|
$i = strtotime( $m );
|
||||||
|
|
||||||
if ( 'U' == $dateformatstring )
|
if ( 'U' == $dateformatstring )
|
||||||
return $i;
|
return $i;
|
||||||
|
|
||||||
if ( $translate)
|
if ( $translate )
|
||||||
return date_i18n( $dateformatstring, $i );
|
return date_i18n( $dateformatstring, $i );
|
||||||
else
|
else
|
||||||
return date( $dateformatstring, $i );
|
return date( $dateformatstring, $i );
|
||||||
|
|
Loading…
Reference in New Issue