- Support $GLOBALS in cvar's. Now list(..) = each($GLOBALS) will work.

- Remove support of $GLOBALS in enacapsed strings. print "$GLOBALS" isn't
  supposed to work in any case.

diff --git a/Zend/zend-parser.y b/Zend/zend-parser.y
index df3e7deabc012c2c993cea653a800308e86d00ac..e89b235a6c280c7bc75b200852f6a0e0a9868f07 100644 (file)
--- a/Zend/zend-parser.y
+++ b/Zend/zend-parser.y
@@ -509,7 +509,7 @@ cvar_without_objects:
 
 reference_variable:
                dim_list ']' { $$ = $1; }
-       |       compound_variable               { do_begin_variable_parse(CLS_C); fetch_simple_variable(&$$, &$1, 1 CLS_CC); }
+       |       compound_variable               { do_fetch_globals(&$1); do_begin_variable_parse(CLS_C); fetch_simple_variable(&$$, &$1, 1 CLS_CC); }
 ;
        
 
@@ -604,7 +604,7 @@ encaps_list:
 
 
 encaps_var:
-               VARIABLE { do_fetch_globals(&$1); do_begin_variable_parse(CLS_C); fetch_simple_variable(&$$, &$1, 1 CLS_CC); }
+               VARIABLE { do_begin_variable_parse(CLS_C); fetch_simple_variable(&$$, &$1, 1 CLS_CC); }
        |       VARIABLE '[' encaps_var_offset ']'      { do_fetch_globals(&$1); do_begin_variable_parse(CLS_C); fetch_array_begin(&$$, &$1, &$3 CLS_CC); }
        |       VARIABLE ZEND_OBJECT_OPERATOR STRING { do_begin_variable_parse(CLS_C); fetch_simple_variable(&$2, &$1, 1 CLS_CC); do_fetch_property(&$$, &$2, &$3 CLS_CC); }
        |       DOLLAR_OPEN_CURLY_BRACES expr '}' { do_begin_variable_parse(CLS_C);  fetch_simple_variable(&$$, &$2, 1 CLS_CC); }