From: Sebastian Bergmann Date: Tue, 1 Nov 2005 07:20:54 +0000 (+0000) Subject: Revert. X-Git-Tag: RELEASE_2_0_1~90 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=621c6fb266c0a97d5297a997b2e27a47ab8400b7;p=php Revert. --- diff --git a/NEWS b/NEWS index 73da6691ee..d207eeae88 100644 --- a/NEWS +++ b/NEWS @@ -22,7 +22,4 @@ PHP NEWS the part of haystack before or after first occurence of needle. (Johannes) - Added possibility to check in which extension an internal function was defined using reflection API. (Johannes) -- Added an additional field $frame['object'] to the result array of - debug_backtrace() that contains a reference to the respective object when the - frame was called from an object. (Sebastian) - Fixed bug #34286 (__toString() behavior is inconsistent). (Marcus) diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index 4027bdc2a2..5967cfc5f2 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -2005,9 +2005,6 @@ ZEND_API void zend_fetch_debug_backtrace(zval *return_value, int skip_last TSRML dup = zend_get_object_classname(ptr->object, &class_name, &class_name_len TSRMLS_CC); add_assoc_text_ex(stack_frame, "class", sizeof("class"), class_name, dup); } - add_assoc_zval_ex(stack_frame, "object", sizeof("object"), ptr->object); - ptr->object->refcount++; - add_assoc_ascii_string_ex(stack_frame, "type", sizeof("type"), "->", 1); } else if (ptr->function_state.function->common.scope) { add_assoc_textl_ex(stack_frame, "class", sizeof("class"), ptr->function_state.function->common.scope->name, ptr->function_state.function->common.scope->name_length, 1);