diff options
| author | Felipe Pena <felipensp@gmail.com> | 2012-07-14 11:37:20 -0300 |
|---|---|---|
| committer | Felipe Pena <felipensp@gmail.com> | 2012-07-14 11:37:20 -0300 |
| commit | 44cdcb7fdbc8756ff669dc7bbccf05e51d12d67f (patch) | |
| tree | a14de5041542d6140760fe2405861b2d27baf82a | |
| parent | afba8b6597367625f36b7cddaa299e3aea0cda45 (diff) | |
| parent | 8b093dee214c1bf02e06eddf512c4a11ed028b3a (diff) | |
| download | php-git-44cdcb7fdbc8756ff669dc7bbccf05e51d12d67f.tar.gz | |
Merge branch 'PHP-5.4'
* PHP-5.4:
- Fixed bug #62564 (Extending MessageFormatter and adding property causes crash)
| -rwxr-xr-x | ext/intl/msgformat/msgformat_class.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/intl/msgformat/msgformat_class.c b/ext/intl/msgformat/msgformat_class.c index d0138854eb..8145a46f17 100755 --- a/ext/intl/msgformat/msgformat_class.c +++ b/ext/intl/msgformat/msgformat_class.c @@ -60,6 +60,7 @@ zend_object_value MessageFormatter_object_create(zend_class_entry *ce TSRMLS_DC) intern = ecalloc( 1, sizeof(MessageFormatter_object) ); msgformat_data_init( &intern->mf_data TSRMLS_CC ); zend_object_std_init( &intern->zo, ce TSRMLS_CC ); + object_properties_init(&intern->zo, ce); retval.handle = zend_objects_store_put( intern, |