cvs: php-src /ext/date php_date.c
| From: | Derick Rethans | Date: | Tue, 19 May 2009 19:43:44 +0000 |
| Subject: | cvs: php-src /ext/date php_date.c | ||
| Groups: | php.cvs php.doc | ||
| Request: | Send a blank email to php-cvs+get-58040@lists.php.net to get a copy of this message | ||
derick Tue May 19 19:43:44 2009 UTC
Modified files:
/php-src/ext/date php_date.c
Log:
- Getting rid of using the environment to guess timezone information from.
#- [DOC]
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.233&r2=1.234&diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.233 php-src/ext/date/php_date.c:1.234
--- php-src/ext/date/php_date.c:1.233 Tue May 19 19:23:12 2009
+++ php-src/ext/date/php_date.c Tue May 19 19:43:44 2009
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_date.c,v 1.233 2009/05/19 19:23:12 bjori Exp $ */
+/* $Id: php_date.c,v 1.234 2009/05/19 19:43:44 derick Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -832,11 +832,6 @@
if (DATEG(timezone) && (strlen(DATEG(timezone)) > 0)) {
return DATEG(timezone);
}
- /* Check environment variable */
- env = getenv("TZ");
- if (env && *env && timelib_timezone_id_is_valid(env, tzdb)) {
- return env;
- }
/* Check config setting for default timezone */
if (DATEG(default_timezone) && (strlen(DATEG(default_timezone)) > 0) &&
timelib_timezone_id_is_valid(DATEG(default_timezone), tzdb)) {
return DATEG(default_timezone);