diff options
| author | Andrei Zmievski <andrei@php.net> | 2001-01-18 14:36:43 +0000 |
|---|---|---|
| committer | Andrei Zmievski <andrei@php.net> | 2001-01-18 14:36:43 +0000 |
| commit | 4ea7ba79c5b039a0a043ef4d84ac9165745927e6 (patch) | |
| tree | d238501a7da09666821438c0c35cdb2c51b25059 /ext/standard/datetime.c | |
| parent | fd46d9ee9eeccd4e812ec2196210bc5e1cac9743 (diff) | |
| download | php-git-4ea7ba79c5b039a0a043ef4d84ac9165745927e6.tar.gz | |
@- Fixed 'O' and 'r' flags of date() to have correct sign for timezone
@ offset. (Andrei)
Diffstat (limited to 'ext/standard/datetime.c')
| -rw-r--r-- | ext/standard/datetime.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/standard/datetime.c b/ext/standard/datetime.c index dfb83e04ba..630ebb8958 100644 --- a/ext/standard/datetime.c +++ b/ext/standard/datetime.c @@ -433,7 +433,7 @@ php_date(INTERNAL_FUNCTION_PARAMETERS, int gm) #if HAVE_TM_GMTOFF sprintf(tmp_buff, "%c%02d%02d", (ta->tm_gmtoff < 0) ? '-' : '+', abs(ta->tm_gmtoff / 3600), abs( ta->tm_gmtoff % 3600)); #else - sprintf(tmp_buff, "%c%02d%02d", ((ta->tm_isdst ? timezone - 3600:timezone)<0)?'-':'+',abs((ta->tm_isdst ? timezone - 3600 : timezone) / 3600), abs((ta->tm_isdst ? timezone - 3600 : timezone) % 3600)); + sprintf(tmp_buff, "%c%02d%02d", ((ta->tm_isdst ? timezone - 3600:timezone)>0)?'-':'+',abs((ta->tm_isdst ? timezone - 3600 : timezone) / 3600), abs((ta->tm_isdst ? timezone - 3600 : timezone) % 3600)); #endif strcat(return_value->value.str.val, tmp_buff); break; @@ -493,7 +493,7 @@ php_date(INTERNAL_FUNCTION_PARAMETERS, int gm) ta->tm_hour, ta->tm_min, ta->tm_sec, - ((ta->tm_isdst ? timezone - 3600 : timezone) < 0) ? '-' : '+', + ((ta->tm_isdst ? timezone - 3600 : timezone) > 0) ? '-' : '+', abs((ta->tm_isdst ? timezone - 3600 : timezone) / 3600), abs((ta->tm_isdst ? timezone - 3600 : timezone) % 3600) ); |