diff options
| author | Marcus Boerger <helly@php.net> | 2006-05-09 23:53:23 +0000 |
|---|---|---|
| committer | Marcus Boerger <helly@php.net> | 2006-05-09 23:53:23 +0000 |
| commit | 637a40423cd7632b2800814c2ba3ad9b95bbd2f4 (patch) | |
| tree | 485f1dd7cf12d0bfe693961120360b965d66c195 /Zend/zend_objects.c | |
| parent | 57184454e9e3ccecb2b55dc71cd7dc1aa65a3ad3 (diff) | |
| download | php-git-637a40423cd7632b2800814c2ba3ad9b95bbd2f4.tar.gz | |
- MFH as discussed
. zend_exception_get_default() -> zend_exception_get_default(TSRMLS_D)
. zend_get_error_exception() -> zend_get_error_exception(TSRMLS_D)
. added E_RECOVERABLE_ERROR
. added ZEND_TOSTRING_FUNC_NAME
. added __tostring function cache to zend_class_entry
. added ZEND_NAMED_ME
. modified ZEND_ME_MAPPING to support method flags
. added ZEND_MN
. method entries now use prefix "zim_" instead of "zif_"
. drop EG(ze1_compatibility_mode)
. changed cast handler, now without (int should_free):
typedef int (*zend_object_cast_t)(zval *readobj, zval *retval, int type TSRMLS_DC);
. changed get_iterator, now receives whether value is by ref:
zend_object_iterator *(*get_iterator)(zend_class_entry *ce, zval *object, int by_ref TSRMLS_DC);
. added zend_objects_store_add_ref_by_handle
. added zend_objects_store_del_ref_by_handle
. convert_to_explicit_type(pzv, type)
Diffstat (limited to 'Zend/zend_objects.c')
| -rw-r--r-- | Zend/zend_objects.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Zend/zend_objects.c b/Zend/zend_objects.c index 6e2c472713..bb8672592f 100644 --- a/Zend/zend_objects.c +++ b/Zend/zend_objects.c @@ -151,11 +151,8 @@ static void zval_add_ref_or_clone(zval **p) ZEND_API void zend_objects_clone_members(zend_object *new_object, zend_object_value new_obj_val, zend_object *old_object, zend_object_handle handle TSRMLS_DC) { - if (EG(ze1_compatibility_mode)) { - zend_hash_copy(new_object->properties, old_object->properties, (copy_ctor_func_t) zval_add_ref_or_clone, (void *) NULL /* Not used anymore */, sizeof(zval *)); - } else { - zend_hash_copy(new_object->properties, old_object->properties, (copy_ctor_func_t) zval_add_ref, (void *) NULL /* Not used anymore */, sizeof(zval *)); - } + zend_hash_copy(new_object->properties, old_object->properties, (copy_ctor_func_t) zval_add_ref, (void *) NULL /* Not used anymore */, sizeof(zval *)); + if (old_object->ce->clone) { zval *new_obj; |