diff options
| author | Xinchen Hui <laruence@php.net> | 2015-02-27 11:11:45 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2015-02-27 11:11:45 +0800 |
| commit | 2d1a3ecd278ace48a941201858ce194747c9cb4f (patch) | |
| tree | 5f3bccdad40489d9b9d4e947afc3f26d914adf70 | |
| parent | 65810bf2596f3d03ec7baf0c5de01235c8ee7e35 (diff) | |
| parent | e441d71baae89bdc5dc6f75407b4a8f5e42b8fa9 (diff) | |
| download | php-git-2d1a3ecd278ace48a941201858ce194747c9cb4f.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
| -rw-r--r-- | ext/date/php_date.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/date/php_date.c b/ext/date/php_date.c index 6a9cd47525..a3f8735433 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -3741,7 +3741,7 @@ static int php_date_timezone_initialize_from_hash(zval **return_value, php_timez zval **z_timezone_type = NULL; if (zend_hash_find(myht, "timezone_type", 14, (void**) &z_timezone_type) == SUCCESS && Z_TYPE_PP(z_timezone_type) == IS_LONG) { - if (zend_hash_find(myht, "timezone", 9, (void**) &z_timezone) == SUCCESS) { + if (zend_hash_find(myht, "timezone", 9, (void**) &z_timezone) == SUCCESS && Z_TYPE_PP(z_timezone) == IS_STRING) { if (SUCCESS == timezone_initialize(*tzobj, Z_STRVAL_PP(z_timezone) TSRMLS_CC)) { return SUCCESS; } |