Patch 55086-v1.diff for Scripting Engine problem Bug #55086

Patch version 2011-06-30 17:30 UTC

• 2011-06-30 17:30 UTC [diff to current]

Developer: pierrick@webstart.fr

Index: Zend/zend_compile.c
===================================================================
--- Zend/zend_compile.c	(revision 312563)
+++ Zend/zend_compile.c	(working copy)
@@ -4052,6 +4052,8 @@
 	/* REM: There should not be a need for copying, 
 	   zend_do_begin_class_declaration is also just using that string */
 	if (class_name) {
+		ulong fetch_type = ZEND_FETCH_CLASS_GLOBAL;
+		zend_resolve_class_name(class_name, &fetch_type, 1 TSRMLS_CC);
 		method_ref->class_name = Z_STRVAL(class_name->u.constant);
 		method_ref->cname_len  = Z_STRLEN(class_name->u.constant);
 	} else {
Index: Zend/zend_language_parser.y
===================================================================
--- Zend/zend_language_parser.y	(revision 312563)
+++ Zend/zend_language_parser.y	(working copy)
@@ -612,8 +612,8 @@
 ;
 
 trait_reference_list:
-		fully_qualified_class_name									{ zend_init_list(&$$.u.op.ptr, Z_STRVAL($1.u.constant) TSRMLS_CC); }
-	|	trait_reference_list ',' fully_qualified_class_name			{ zend_add_to_list(&$1.u.op.ptr, Z_STRVAL($3.u.constant) TSRMLS_CC); $$ = $1; }
+		fully_qualified_class_name									{ ulong fetch_type = ZEND_FETCH_CLASS_GLOBAL; zend_resolve_class_name(&$1, &fetch_type, 1 TSRMLS_CC); zend_init_list(&$$.u.op.ptr, Z_STRVAL($1.u.constant) TSRMLS_CC); }
+	|	trait_reference_list ',' fully_qualified_class_name			{ ulong fetch_type = ZEND_FETCH_CLASS_GLOBAL; zend_resolve_class_name(&$3, &fetch_type, 1 TSRMLS_CC); zend_add_to_list(&$1.u.op.ptr, Z_STRVAL($3.u.constant) TSRMLS_CC); $$ = $1; }
 ;
 
 trait_method_reference: