cvs: php-src /ext/date php_date.c

derick Fri Oct 7 16:32:00 2005 EDT Modified files: /php-src/ext/date php_date.c Log: - Make the Windows guessing routines actually return the guessed timezone. http://cvs.php.net/diff.php/php-src/ext/date/php_date.c?r1=1.59&r2=1.60&ty=u Index: php-src/ext/date/php_date.c diff -u php-src/ext/date/php_date.c:1.59 php-src/ext/date/php_date.c:1.60 --- php-src/ext/date/php_date.c:1.59 Fri Oct 7 09:33:13 2005 +++ php-src/ext/date/php_date.c Fri Oct 7 16:31:57 2005 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_date.c,v 1.59 2005/10/07 13:33:13 derick Exp $ */ +/* $Id: php_date.c,v 1.60 2005/10/07 20:31:57 derick Exp $ */ #include "php.h" #include "php_streams.h" @@ -340,6 +340,7 @@ case TIME_ZONE_ID_UNKNOWN: /* we have no clue what it is, return UTC */ php_error_docref(NULL TSRMLS_CC, E_STRICT, "It is not safe to rely on the systems timezone settings, please use the date.timezone setting, the TZ environment variable or the date_default_timezone_set() function. We use 'UTC' instead."); + tzid = "UTC"; break; case TIME_ZONE_ID_STANDARD: @@ -357,8 +358,8 @@ } php_error_docref(NULL TSRMLS_CC, E_STRICT, "It is not safe to rely on the systems timezone settings, please use the date.timezone setting, the TZ environment variable or the date_default_timezone_set() function. We use '%s' for '%.1f/DST' instead.", tzid, (float) ((tzi.Bias + tzi.DaylightBias) / -60)); break; - } + return tzid; } #endif /* Fallback to UTC */