diff options
| author | Felipe Pena <felipe@php.net> | 2010-04-26 00:13:34 +0000 |
|---|---|---|
| committer | Felipe Pena <felipe@php.net> | 2010-04-26 00:13:34 +0000 |
| commit | 0a6bcd44a72197bc8fb5658ce9fe4b46019ab9b3 (patch) | |
| tree | b015404b606eda42e2573e7a412c9b5518c5fa0a /Zend/zend_compile.c | |
| parent | 7211284ac7f217694f2f351ec223f94af7db0d16 (diff) | |
| download | php-git-0a6bcd44a72197bc8fb5658ce9fe4b46019ab9b3.tar.gz | |
- Removed allow_call_time_pass_reference (Pierrick)
Diffstat (limited to 'Zend/zend_compile.c')
| -rw-r--r-- | Zend/zend_compile.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 4ee458e5cc..9ba45f36ed 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -2335,21 +2335,21 @@ void zend_do_pass_param(znode *param, zend_uchar op, int offset TSRMLS_DC) /* {{ zend_stack_top(&CG(function_call_stack), (void **) &function_ptr_ptr); function_ptr = *function_ptr_ptr; - if (original_op == ZEND_SEND_REF && !CG(allow_call_time_pass_reference)) { + if (original_op == ZEND_SEND_REF) { if (function_ptr && function_ptr->common.function_name && function_ptr->common.type == ZEND_USER_FUNCTION && !ARG_SHOULD_BE_SENT_BY_REF(function_ptr, (zend_uint) offset)) { - zend_error(E_DEPRECATED, - "Call-time pass-by-reference has been deprecated; " - "If you would like to pass it by reference, modify the declaration of %s(). " - "If you would like to enable call-time pass-by-reference, you can set " - "allow_call_time_pass_reference to true in your INI file", function_ptr->common.function_name); + zend_error(E_COMPILE_ERROR, + "Call-time pass-by-reference has been removed; " + "If you would like to pass argument by reference, modify the declaration of %s().", + function_ptr->common.function_name); } else { - zend_error(E_DEPRECATED, "Call-time pass-by-reference has been deprecated"); + zend_error(E_COMPILE_ERROR, "Call-time pass-by-reference has been removed"); } - } - + return; + } + if (function_ptr) { if (ARG_MAY_BE_SENT_BY_REF(function_ptr, (zend_uint) offset)) { if (param->op_type & (IS_VAR|IS_CV)) { |