summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS3
-rw-r--r--Zend/zend_builtin_functions.c10
2 files changed, 9 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index 719fb30b43..e89679d6cd 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+?? ??? 20??, PHP 5.2.5
+- Added optional parameter $provide_object to debug_backtrace(). (Sebastian)
+
30 Aug 2007, PHP 5.2.4
- Removed --enable-versioning configure option. (Jani)
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index 88b14f4b2e..f56e74be75 100644
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@ -2093,15 +2093,17 @@ ZEND_API void zend_fetch_debug_backtrace(zval *return_value, int skip_last, int
/* }}} */
-/* {{{ proto array debug_backtrace(void)
+/* {{{ proto array debug_backtrace([bool provide_object])
Return backtrace as array */
ZEND_FUNCTION(debug_backtrace)
{
- if (ZEND_NUM_ARGS()) {
- ZEND_WRONG_PARAM_COUNT();
+ zend_bool provide_object = 1;
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", &provide_object) == FAILURE) {
+ return;
}
- zend_fetch_debug_backtrace(return_value, 1, 1 TSRMLS_CC);
+ zend_fetch_debug_backtrace(return_value, 1, provide_object TSRMLS_CC);
}
/* }}} */