From: Jani Taskinen <jani@php.net>
Date: Thu, 20 Sep 2007 14:11:32 +0000 (+0000)
Subject: - Fix test and tuned error message
X-Git-Tag: php-5.2.5RC1~119
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ba144fd4170c11e946ff4488b1634ac73fabd2ce;p=php

- 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 48f235355c..0a45fb9113 100644
--- 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 3fc7a6dac5..2d5699e70b 100644
--- 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) {