cvs: ZendEngine2 / zend_compile.c

dmitry		Wed Jan 14 13:57:59 2009 UTC

  Modified files:              
    /ZendEngine2	zend_compile.c 
  Log:
  Fixed bug #46755 (warning: use statement with non-compound name)
  Fixed bug #46979 (use with non-compound name *has* effect)
  
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_compile.c?r1=1.847&r2=1.848&diff_format=u
Index: ZendEngine2/zend_compile.c
diff -u ZendEngine2/zend_compile.c:1.847 ZendEngine2/zend_compile.c:1.848
--- ZendEngine2/zend_compile.c:1.847	Thu Jan  8 22:35:30 2009
+++ ZendEngine2/zend_compile.c	Wed Jan 14 13:57:59 2009
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_compile.c,v 1.847 2009/01/08 22:35:30 tony2001 Exp $ */
+/* $Id: zend_compile.c,v 1.848 2009/01/14 13:57:59 dmitry Exp $ */
 
 #include <zend_language_parser.h>
 #include "zend.h"
@@ -5548,7 +5548,7 @@
 			} else {
 				*name = *ns;
 				zval_copy_ctor(name);
-				warn = !is_global;
+				warn = !is_global && !CG(current_namespace);
 			}
 		} else {
 			char *p = zend_memrchr(Z_STRVAL_P(ns), '\\', Z_STRLEN_P(ns));
@@ -5557,7 +5557,7 @@
 			} else {
 				*name = *ns;
 				zval_copy_ctor(name);
-				warn = !is_global;
+				warn = !is_global && !CG(current_namespace);
 			}
 		}
 	}