"Undefined variable: %s" noticies were fixed to use one space

diff --git a/Zend/tests/bug22836.phpt b/Zend/tests/bug22836.phpt
index 1edcaa5c17a3c3357d5868eab10127d26d1708af..ceaf6414b639635070084e83ef77c5ad6b7893f6 100644 (file)
--- a/Zend/tests/bug22836.phpt
+++ b/Zend/tests/bug22836.phpt
@@ -19,55 +19,55 @@ for ($i = 0; $i < 8; $i++) {
 string(3) "foo"
 'foo'
 
-Notice: Undefined variable:  a in %s on line %d
+Notice: Undefined variable: a in %s on line %d
 
 Strict Standards: Only variable references should be returned by reference in %s on line %d
 string(3) "foo"
 'foo'
 
-Notice: Undefined variable:  a in %s on line %d
+Notice: Undefined variable: a in %s on line %d
 
 Strict Standards: Only variable references should be returned by reference in %s on line %d
 string(3) "foo"
 'foo'
 
-Notice: Undefined variable:  a in %s on line %d
+Notice: Undefined variable: a in %s on line %d
 
 Strict Standards: Only variable references should be returned by reference in %s on line %d
 string(3) "foo"
 'foo'
 
-Notice: Undefined variable:  a in %s on line %d
+Notice: Undefined variable: a in %s on line %d
 
 Strict Standards: Only variable references should be returned by reference in %s on line %d
 string(3) "foo"
 'foo'
 
-Notice: Undefined variable:  a in %s on line %d
+Notice: Undefined variable: a in %s on line %d
 
 Strict Standards: Only variable references should be returned by reference in %s on line %d
 string(3) "foo"
 'foo'
 
-Notice: Undefined variable:  a in %s on line %d
+Notice: Undefined variable: a in %s on line %d
 
 Strict Standards: Only variable references should be returned by reference in %s on line %d
 string(3) "foo"
 'foo'
 
-Notice: Undefined variable:  a in %s on line %d
+Notice: Undefined variable: a in %s on line %d
 
 Strict Standards: Only variable references should be returned by reference in %s on line %d
 string(3) "foo"
 'foo'
 
-Notice: Undefined variable:  a in %s on line %d
+Notice: Undefined variable: a in %s on line %d
 
 Strict Standards: Only variable references should be returned by reference in %s on line %d
 string(3) "foo"
 'foo'
 
-Notice: Undefined variable:  a in %s on line %d
+Notice: Undefined variable: a in %s on line %d
 
 Strict Standards: Only variable references should be returned by reference in %s on line %d
 

diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index 5328ec18aba28989ae0af64d0c8a6da03b20e307..bbed710fcef78c9424ce518379ab4cd036e036f9 100644 (file)
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -763,13 +763,13 @@ static void zend_fetch_var_address(zend_op *opline, temp_variable *Ts, int type
                if (zend_hash_find(target_symbol_table, varname->value.str.val, varname->value.str.len+1, (void **) &retval) == FAILURE) {
                        switch (type) {
                                case BP_VAR_R: 
-                                       zend_error(E_NOTICE,"Undefined variable:  %s", varname->value.str.val);
+                                       zend_error(E_NOTICE,"Undefined variable: %s", varname->value.str.val);
                                        /* break missing intentionally */
                                case BP_VAR_IS:
                                        retval = &EG(uninitialized_zval_ptr);
                                        break;
                                case BP_VAR_RW:
-                                       zend_error(E_NOTICE,"Undefined variable:  %s", varname->value.str.val);
+                                       zend_error(E_NOTICE,"Undefined variable: %s", varname->value.str.val);
                                        /* break missing intentionally */
                                case BP_VAR_W: {                                        
                                                zval *new_zval = &EG(uninitialized_zval);

diff --git a/tests/classes/static_this.phpt b/tests/classes/static_this.phpt
index 3b1bb3e6042bd8a4a6a6bc4a29cf3ca98061d8a9..12f4b6389b3d177ea39fdde749b8c8b8e19032be 100755 (executable)
--- a/tests/classes/static_this.phpt
+++ b/tests/classes/static_this.phpt
@@ -29,10 +29,10 @@ TestClass::Test2(new stdClass);
 ===DONE===
 --EXPECTF--
 
-Notice: Undefined variable:  this in %sstatic_this.php on line %d
+Notice: Undefined variable: this in %sstatic_this.php on line %d
 NULL
 
-Notice: Undefined variable:  this in %sstatic_this.php on line %d
+Notice: Undefined variable: this in %sstatic_this.php on line %d
 NULL
 object(stdClass)#%d (0) {
 }