From fd9b7f672b0bdebeae59bc022259a2ae2e073ba6 Mon Sep 17 00:00:00 2001 From: Sara Golemon Date: Fri, 6 Oct 2006 00:02:56 +0000 Subject: [PATCH] Revert until 5.2's release since we're in RC stage --- Zend/zend.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/Zend/zend.c b/Zend/zend.c index e23005b739..fbef8186c7 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -1077,7 +1077,6 @@ ZEND_API int zend_execute_scripts(int type TSRMLS_DC, zval **retval, int file_co int i; zend_file_handle *file_handle; zend_op_array *orig_op_array = EG(active_op_array); - zval **orig_retval_ptr_ptr = EG(return_value_ptr_ptr); zval *local_retval=NULL; va_start(files, file_count); @@ -1140,13 +1139,11 @@ ZEND_API int zend_execute_scripts(int type TSRMLS_DC, zval **retval, int file_co } else if (type==ZEND_REQUIRE) { va_end(files); EG(active_op_array) = orig_op_array; - EG(return_value_ptr_ptr) = orig_retval_ptr_ptr; return FAILURE; } } va_end(files); EG(active_op_array) = orig_op_array; - EG(return_value_ptr_ptr) = orig_retval_ptr_ptr; return SUCCESS; } -- 2.50.1