diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-07-07 00:49:33 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-07-07 00:50:07 -0700 |
| commit | 04a227dd1610355ce2a86a3bad718c86eed1e6fa (patch) | |
| tree | 96cc3e8f7ee64f98dd90107a4f1f820dc4ef1486 /ext/intl/php_intl.c | |
| parent | effb2b7a1312ecf952d6a752c0ce6190f7aede1e (diff) | |
| parent | 96c9cc315d8dea5b0d2c8b855620e3723d149470 (diff) | |
| download | php-git-04a227dd1610355ce2a86a3bad718c86eed1e6fa.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix bug #66921 - Wrong argument type hint for function intltz_from_date_time_zone
fix format
Diffstat (limited to 'ext/intl/php_intl.c')
| -rw-r--r-- | ext/intl/php_intl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/intl/php_intl.c b/ext/intl/php_intl.c index 65e53c8b5e..ff1627a18f 100644 --- a/ext/intl/php_intl.c +++ b/ext/intl/php_intl.c @@ -445,7 +445,7 @@ ZEND_BEGIN_ARG_INFO_EX( arginfo_tz_idarg_static, 0, 0, 1 ) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX( arginfo_tz_from_date_time_zone, 0, 0, 1 ) - ZEND_ARG_OBJ_INFO( 0, dateTimeZone, IntlDateTimeZone, 0 ) + ZEND_ARG_OBJ_INFO( 0, dateTimeZone, DateTimeZone, 0 ) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX( arginfo_tz_create_enumeration, 0, 0, 0 ) |