diff options
| author | Xinchen Hui <laruence@php.net> | 2014-06-29 15:24:00 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2014-06-29 15:28:55 +0800 |
| commit | 9fb8c16b6cd5f8c47ab6b83b821f0bf79448bcac (patch) | |
| tree | 5075a8b9876f9175501237ab687fe5a14845e316 /ext/intl/breakiterator/breakiterator_class.cpp | |
| parent | e1437022e188747495badcfa2b86282456bc27e8 (diff) | |
| download | php-git-9fb8c16b6cd5f8c47ab6b83b821f0bf79448bcac.tar.gz | |
Fixed temporarily un-expected object re-init
Diffstat (limited to 'ext/intl/breakiterator/breakiterator_class.cpp')
| -rw-r--r-- | ext/intl/breakiterator/breakiterator_class.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ext/intl/breakiterator/breakiterator_class.cpp b/ext/intl/breakiterator/breakiterator_class.cpp index ecaf503565..7aa1eae0bc 100644 --- a/ext/intl/breakiterator/breakiterator_class.cpp +++ b/ext/intl/breakiterator/breakiterator_class.cpp @@ -47,7 +47,7 @@ zend_object_handlers BreakIterator_handlers; /* }}} */ U_CFUNC void breakiterator_object_create(zval *object, - BreakIterator *biter TSRMLS_DC) + BreakIterator *biter, int brand_new TSRMLS_DC) { UClassID classId = biter->getDynamicClassID(); zend_class_entry *ce; @@ -60,7 +60,9 @@ U_CFUNC void breakiterator_object_create(zval *object, ce = BreakIterator_ce_ptr; } - object_init_ex(object, ce); + if (brand_new) { + object_init_ex(object, ce); + } breakiterator_object_construct(object, biter TSRMLS_CC); } |