diff options
| author | Sara Golemon <pollita@php.net> | 2006-10-06 00:02:56 +0000 |
|---|---|---|
| committer | Sara Golemon <pollita@php.net> | 2006-10-06 00:02:56 +0000 |
| commit | fd9b7f672b0bdebeae59bc022259a2ae2e073ba6 (patch) | |
| tree | 344f8e988a50d70d6499d9fd5165cfd373a55070 /Zend/zend.c | |
| parent | 67fac322af112e7e85c11bea60575814a708d193 (diff) | |
| download | php-git-fd9b7f672b0bdebeae59bc022259a2ae2e073ba6.tar.gz | |
Revert until 5.2's release since we're in RC stage
Diffstat (limited to 'Zend/zend.c')
| -rw-r--r-- | Zend/zend.c | 3 |
1 files changed, 0 insertions, 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; } |