From 39e721cf50276e5872e445b36fefdc4eb80cdcf7 Mon Sep 17 00:00:00 2001 From: Derick Rethans Date: Tue, 11 Feb 2014 11:27:01 +0000 Subject: [PATCH] Fixed ZTS and added fix to NEWS. --- NEWS | 4 ++++ ext/date/php_date.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 04bb71c4fd..c657efc943 100644 --- a/NEWS +++ b/NEWS @@ -5,6 +5,10 @@ PHP NEWS - Core: . Fixed Request #66574i (Allow multiple paths in php_ini_scanned_path). (Remi) +- Date: + . Fixed bug #45528 (Allow the DateTimeZone constructor to accept timezones + per offset too). (Derick) + - LDAP: . Implemented ldap_modify_batch (https://wiki.php.net/rfc/ldap_modify_batch). (Ondřej Hošek) diff --git a/ext/date/php_date.c b/ext/date/php_date.c index a61d9db3c1..f6b12bc42e 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -3638,7 +3638,7 @@ static int timezone_initialize(php_timezone_obj *tzobj, /*const*/ char *tz TSRML efree(dummy_t); return FAILURE; } else { - set_timezone_from_timelib_time(tzobj, dummy_t TSRMLS_CC); + set_timezone_from_timelib_time(tzobj, dummy_t); efree(dummy_t); return SUCCESS; } -- 2.50.1