From: Dmitry Stogov <dmitry@php.net>
Date: Fri, 24 Dec 2004 08:24:55 +0000 (+0000)
Subject: "Undefined variable:  %s" noticies were fixed to be compatible with PHP_5_0
X-Git-Tag: RELEASE_0_2~474
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e986a1f47ed301801eaef66c261604a306a42127;p=php

"Undefined variable:  %s" noticies were fixed to be compatible with PHP_5_0
---

diff --git a/Zend/tests/unset_cv01.phpt b/Zend/tests/unset_cv01.phpt
index 99af118d10..c7d1161325 100644
--- a/Zend/tests/unset_cv01.phpt
+++ b/Zend/tests/unset_cv01.phpt
@@ -10,4 +10,4 @@ echo $x;
 --EXPECTF--
 ok
 
-Notice: Undefined variable: x in %sunset_cv01.php on line %d
+Notice: Undefined variable:  x in %sunset_cv01.php on line %d
diff --git a/Zend/tests/unset_cv02.phpt b/Zend/tests/unset_cv02.phpt
index cb2475350c..a6a0a8d256 100644
--- a/Zend/tests/unset_cv02.phpt
+++ b/Zend/tests/unset_cv02.phpt
@@ -10,4 +10,4 @@ echo $x;
 --EXPECTF--
 ok
 
-Notice: Undefined variable: x in %sunset_cv02.php on line %d
+Notice: Undefined variable:  x in %sunset_cv02.php on line %d
diff --git a/Zend/tests/unset_cv03.phpt b/Zend/tests/unset_cv03.phpt
index 221abe2d88..874f7ea7df 100644
--- a/Zend/tests/unset_cv03.phpt
+++ b/Zend/tests/unset_cv03.phpt
@@ -10,4 +10,4 @@ echo $x;
 --EXPECTF--
 ok
 
-Notice: Undefined variable: x in %sunset_cv03.php on line %d
+Notice: Undefined variable:  x in %sunset_cv03.php on line %d
diff --git a/Zend/tests/unset_cv04.phpt b/Zend/tests/unset_cv04.phpt
index 5044cb1c8d..4267c3cb7c 100644
--- a/Zend/tests/unset_cv04.phpt
+++ b/Zend/tests/unset_cv04.phpt
@@ -13,4 +13,4 @@ f();
 --EXPECTF--
 ok
 
-Notice: Undefined variable: x in %sunset_cv04.php on line %d
+Notice: Undefined variable:  x in %sunset_cv04.php on line %d
diff --git a/Zend/tests/unset_cv06.phpt b/Zend/tests/unset_cv06.phpt
index fd5c6886ae..c7454b8dbc 100644
--- a/Zend/tests/unset_cv06.phpt
+++ b/Zend/tests/unset_cv06.phpt
@@ -20,5 +20,5 @@ echo "ok\n";
 1
 2
 
-Notice: Undefined variable: x in %sunset_cv06.php on line %d
+Notice: Undefined variable:  x in %sunset_cv06.php on line %d
 ok
diff --git a/Zend/tests/unset_cv08.phpt b/Zend/tests/unset_cv08.phpt
index f1b61bf827..66864081be 100644
--- a/Zend/tests/unset_cv08.phpt
+++ b/Zend/tests/unset_cv08.phpt
@@ -12,5 +12,5 @@ echo "ok\n";
 --EXPECTF--
 ok
 
-Notice: Undefined variable: b in %sunset_cv08.php on line %d
+Notice: Undefined variable:  b in %sunset_cv08.php on line %d
 ok
diff --git a/Zend/tests/unset_cv09.phpt b/Zend/tests/unset_cv09.phpt
index a5407ad64e..4129446e2e 100644
--- a/Zend/tests/unset_cv09.phpt
+++ b/Zend/tests/unset_cv09.phpt
@@ -10,5 +10,5 @@ echo "ok\n";
 --EXPECTF--
 ok
 
-Notice: Undefined variable: x in %sunset_cv09.php on line %d
+Notice: Undefined variable:  x in %sunset_cv09.php on line %d
 ok
diff --git a/Zend/tests/unset_cv10.phpt b/Zend/tests/unset_cv10.phpt
index 0eb41922c5..bfc03f78ef 100644
--- a/Zend/tests/unset_cv10.phpt
+++ b/Zend/tests/unset_cv10.phpt
@@ -14,5 +14,5 @@ echo "ok\n";
 --EXPECTF--
 ok
 
-Notice: Undefined variable: x in %sunset_cv10.php on line %d
+Notice: Undefined variable:  x in %sunset_cv10.php on line %d
 ok
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index ede4e5a762..f16a2af035 100644
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -211,13 +211,13 @@ static inline zval *_get_zval_ptr(znode *node, temp_variable *Ts, zend_free_op *
 					switch (type) {
 						case BP_VAR_R:
 						case BP_VAR_UNSET:
-							zend_error(E_NOTICE, "Undefined variable: %s", cv->name);
+							zend_error(E_NOTICE, "Undefined variable:  %s", cv->name);
 							/* break missing intentionally */
 						case BP_VAR_IS:
 							return &EG(uninitialized_zval);
 							break;
 						case BP_VAR_RW:
-							zend_error(E_NOTICE, "Undefined variable: %s", cv->name);
+							zend_error(E_NOTICE, "Undefined variable:  %s", cv->name);
 							/* break missing intentionally */
 						case BP_VAR_W:
 							zend_get_cv_address(cv, ptr, Ts TSRMLS_CC);
@@ -331,13 +331,13 @@ static inline zval *_get_zval_ptr_cv(znode *node, temp_variable *Ts, zend_free_o
 			switch (type) {
 				case BP_VAR_R:
 				case BP_VAR_UNSET:
-					zend_error(E_NOTICE, "Undefined variable: %s", cv->name);
+					zend_error(E_NOTICE, "Undefined variable:  %s", cv->name);
 					/* break missing intentionally */
 				case BP_VAR_IS:
 					return &EG(uninitialized_zval);
 					break;
 				case BP_VAR_RW:
-					zend_error(E_NOTICE, "Undefined variable: %s", cv->name);
+					zend_error(E_NOTICE, "Undefined variable:  %s", cv->name);
 					/* break missing intentionally */
 				case BP_VAR_W:
 					zend_get_cv_address(cv, ptr, Ts TSRMLS_CC);