diff options
| author | Derick Rethans <github@derickrethans.nl> | 2014-02-11 11:27:01 +0000 |
|---|---|---|
| committer | Derick Rethans <github@derickrethans.nl> | 2014-02-11 11:27:01 +0000 |
| commit | 39e721cf50276e5872e445b36fefdc4eb80cdcf7 (patch) | |
| tree | 2a205f8f45cbe586002d40e242d0b0845533e797 | |
| parent | 179e45920cbedc3bee1a8c46457cb42b2926e5e4 (diff) | |
| download | php-git-39e721cf50276e5872e445b36fefdc4eb80cdcf7.tar.gz | |
Fixed ZTS and added fix to NEWS.
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | ext/date/php_date.c | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -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; } |