| Sebastian Bergmann 2005-11-01, 3:55 am |
| sebastian Tue Nov 1 02:20:54 2005 EDT
Modified files:
/php-src NEWS
/ZendEngine2 zend_builtin_functions.c
Log:
Revert.
http://cvs.php.net/diff.php/php-src...&r2=1.2074&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2073 php-src/NEWS:1.2074
--- php-src/NEWS:1.2073 Fri Oct 28 16:08:05 2005
+++ php-src/NEWS Tue Nov 1 02:20:49 2005
@@ -22,7 +22,4 @@
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)
http://cvs.php.net/diff.php/ZendEng...5&r2=1.296&ty=u
Index: ZendEngine2/zend_builtin_functions.c
diff -u ZendEngine2/zend_builtin_functions.c:1.295 ZendEngine2/zend_builtin_functions.c:1.296
--- ZendEngine2/zend_builtin_functions.c:1.295 Fri Oct 28 16:08:25 2005
+++ ZendEngine2/zend_builtin_functions.c Tue Nov 1 02:20:54 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_builtin_functions.c,v 1.295 2005/10/28 20:08:25 sebastian Exp $ */
+/* $Id: zend_builtin_functions.c,v 1.296 2005/11/01 07:20:54 sebastian Exp $ */
#include "zend.h"
#include "zend_API.h"
@@ -2005,9 +2005,6 @@
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);
|