diff options
| author | Felipe Pena <felipensp@gmail.com> | 2012-07-14 12:23:24 -0300 |
|---|---|---|
| committer | Felipe Pena <felipensp@gmail.com> | 2012-07-14 12:23:24 -0300 |
| commit | f94051ea11ebfa206ef0c52da86334dcf9b93c66 (patch) | |
| tree | 50d38d22fa11bc3357ce660ddb3d99b00929c10d /ext/intl/formatter/formatter_class.c | |
| parent | 44cdcb7fdbc8756ff669dc7bbccf05e51d12d67f (diff) | |
| parent | 0bff7cfadd0177601cd7b7253b7311d3bd13fa45 (diff) | |
| download | php-git-f94051ea11ebfa206ef0c52da86334dcf9b93c66.tar.gz | |
- Fix conflict
Diffstat (limited to 'ext/intl/formatter/formatter_class.c')
| -rwxr-xr-x | ext/intl/formatter/formatter_class.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/intl/formatter/formatter_class.c b/ext/intl/formatter/formatter_class.c index 8fcda643bf..28af14e5db 100755 --- a/ext/intl/formatter/formatter_class.c +++ b/ext/intl/formatter/formatter_class.c @@ -62,6 +62,7 @@ zend_object_value NumberFormatter_object_create(zend_class_entry *ce TSRMLS_DC) intern = ecalloc( 1, sizeof(NumberFormatter_object) ); formatter_data_init( &intern->nf_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, |