- Fix test and tuned error message

diff --git a/Zend/tests/magic_by_ref_010.phpt b/Zend/tests/magic_by_ref_010.phpt
index 48f235355c566fda9d6405287de3314e2f06a20a..0a45fb91137b6d612f5abe4a75000d02e4f2263b 100644 (file)
--- a/Zend/tests/magic_by_ref_010.phpt
+++ b/Zend/tests/magic_by_ref_010.phpt
@@ -1,5 +1,7 @@
 --TEST--
 passing arguments by ref to a method handled by __call()
+--INI--
+allow_call_time_pass_reference=1
 --FILE--
 <?php
 

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 3fc7a6dac55e352f693465c07edf65e78113b8f8..2d5699e70b4818375e8046f0a544670e7e17e8b4 100644 (file)
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -1552,11 +1552,11 @@ void zend_do_pass_param(znode *param, zend_uchar op, int offset TSRMLS_DC)
        if (original_op==ZEND_SEND_REF
                && !CG(allow_call_time_pass_reference)) {
                zend_error(E_COMPILE_WARNING,
-                                       "Call-time pass-by-reference has been 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?function_ptr->common.function_name:"[runtime function name]"));
+                                       "allow_call_time_pass_reference to true in your INI file",
+                                       (function_ptr ? function_ptr->common.function_name : "[runtime function name]"));
        }
 
        if (function_ptr) {