From: Derick Rethans <github@derickrethans.nl>
Date: Tue, 11 Feb 2014 11:27:01 +0000 (+0000)
Subject: Fixed ZTS and added fix to NEWS.
X-Git-Tag: php-5.5.10RC1~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=39e721cf50276e5872e445b36fefdc4eb80cdcf7;p=php

Fixed ZTS and added fix to NEWS.
---

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;
 	}