diff options
| author | Gustavo Lopes <glopes@nebm.ist.utl.pt> | 2012-08-26 23:42:57 +0200 |
|---|---|---|
| committer | Gustavo Lopes <glopes@nebm.ist.utl.pt> | 2012-08-26 23:42:57 +0200 |
| commit | befe4ab479a615298d93332b15ebcc69cee426bb (patch) | |
| tree | 9a3c2c644b68f7c5cb5027ad761ee155eb00c7d1 /ext/intl/formatter | |
| parent | 011af74b23fd419b34d4aee85cac39ffdd217665 (diff) | |
| parent | 886a50a619e55c9c1a5597449d6c71c69ff6fef8 (diff) | |
| download | php-git-befe4ab479a615298d93332b15ebcc69cee426bb.tar.gz | |
Merge branch 'PHP-5.4'
* PHP-5.4:
Fixed defective cloning in ext/intl classes
NEWS for commit 72c807a
Allow Spoofchecker to be registered on ICU 49.1
Announce on NEWS change in 1ce572c
Diffstat (limited to 'ext/intl/formatter')
| -rw-r--r-- | ext/intl/formatter/formatter_class.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/intl/formatter/formatter_class.c b/ext/intl/formatter/formatter_class.c index 8f399a6773..2246cd29a5 100644 --- a/ext/intl/formatter/formatter_class.c +++ b/ext/intl/formatter/formatter_class.c @@ -86,7 +86,7 @@ zend_object_value NumberFormatter_object_clone(zval *object TSRMLS_DC) NumberFormatter_object *nfo, *new_nfo; FORMATTER_METHOD_FETCH_OBJECT_NO_CHECK; - new_obj_val = NumberFormatter_ce_ptr->create_object(NumberFormatter_ce_ptr TSRMLS_CC); + new_obj_val = NumberFormatter_ce_ptr->create_object(Z_OBJCE_P(object) TSRMLS_CC); new_nfo = (NumberFormatter_object *)zend_object_store_get_object_by_handle(new_obj_val.handle TSRMLS_CC); /* clone standard parts */ zend_objects_clone_members(&new_nfo->zo, new_obj_val, &nfo->zo, handle TSRMLS_CC); |