Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-23 01:27:36 +01:00
Code Issues Projects Releases Wiki Activity

fixed get_date_from_gmt()

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@918 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
michelvaldrighi 2004-02-23 05:36:57 +00:00
parent bd3265d911
commit f73218bb31
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
wp-includes/functions-formatting.php
View File

@ -393,10 +393,10 @@ function wp_iso_descrambler($string) {
function get_gmt_from_date($string) {
$time_difference = get_settings('time_difference');
// $string must be of the form 'yyyy-mm-dd hh:mm:ss'
if ($string != gmdate('Y-m-d H:i:s')) {
if ($string != gmdate('Y-m-d H:i:s', strtotime($string))) {
$string_time = gmmktime(substr($string,11,13), substr($string,14,16), substr($string,17,19), substr($string,5,7), substr($string,8,10), substr($string,0,4));
$gmt_time = $string_time - $time_difference*3600;
return gmdate('Y-m-d H:i:s', $gmt_time);
return date('Y-m-d H:i:s', $gmt_time);
} else {
return $string;
}
@ -406,10 +406,9 @@ function get_gmt_from_date($string) {
function get_date_from_gmt($string) {
$time_difference = get_settings('time_difference');
// $string must be of the form 'yyyy-mm-dd hh:mm:ss'
if ($string == gmdate('Y-m-d H:i:s')) {
$string_time = gmmktime(substr($string,11,13), substr($string,14,16), substr($string,17,19), substr($string,5,7), substr($string,8,10), substr($string,0,4));
$local_time = $string_time + $time_difference*3600;
return gmdate('Y-m-d H:i:s', $local_time);
if ($string == gmdate('Y-m-d H:i:s', gmmktime(substr($string,11,13), substr($string,14,16), substr($string,17,19), substr($string,5,7), substr($string,8,10), substr($string,0,4)))) {
$local_time = strtotime($string) + $time_difference*3600;
return date('Y-m-d H:i:s', $local_time);
} else {
return $string;
}