diff options
Diffstat (limited to 'Zend/zend_execute_API.c')
| -rw-r--r-- | Zend/zend_execute_API.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index ab5766af27..6a2b82f96d 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -619,7 +619,7 @@ ZEND_API int zval_update_constant(zval *pp) /* {{{ */ } /* }}} */ -int _call_user_function_ex(zval *object, zval *function_name, zval *retval_ptr, uint32_t param_count, zval params[], int no_separation) /* {{{ */ +int _call_user_function_ex(zval *object, zval *function_name, zval *retval_ptr, uint32_t param_count, zval params[]) /* {{{ */ { zend_fcall_info fci; @@ -629,7 +629,6 @@ int _call_user_function_ex(zval *object, zval *function_name, zval *retval_ptr, fci.retval = retval_ptr; fci.param_count = param_count; fci.params = params; - fci.no_separation = (zend_bool) no_separation; return zend_call_function(&fci, NULL); } @@ -737,10 +736,7 @@ int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache) / if (ARG_SHOULD_BE_SENT_BY_REF(func, i + 1)) { if (UNEXPECTED(!Z_ISREF_P(arg))) { - if (!fci->no_separation) { - /* Separation is enabled -- create a ref */ - ZVAL_NEW_REF(arg, arg); - } else if (!ARG_MAY_BE_SENT_BY_REF(func, i + 1)) { + if (!ARG_MAY_BE_SENT_BY_REF(func, i + 1)) { /* By-value send is not allowed -- emit a warning, * but still perform the call with a by-value send. */ zend_param_must_be_ref(func, i + 1); @@ -866,7 +862,6 @@ ZEND_API void zend_call_known_function( fci.retval = retval_ptr ? retval_ptr : &retval; fci.param_count = param_count; fci.params = params; - fci.no_separation = 1; ZVAL_UNDEF(&fci.function_name); /* Unused */ fcic.function_handler = fn; |