Stas's patch on zend_execute.c (1.448 -> 1.449) resulted in a bug where

the namespaced member accesses didn't work. This should hopefully
correct it.

diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index 88274c8e176187ce09479f23b135f187059b4986..fbb8c491c2f336b8ad56b7a1eee0e9ff915e0403 100644 (file)
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -2371,7 +2371,7 @@ int zend_fetch_class_handler(ZEND_OPCODE_HANDLER_ARGS)
 
                        if(retval == FAILURE) {
                                /* try namespace */
-                               if(zend_hash_find(&EG(global_namespace_ptr)->class_table, class_name_strval, class_name_strlen+1, (void **)&pce) == SUCCESS && (*pce)->type != ZEND_USER_NAMESPACE && (*pce)->type != ZEND_INTERNAL_NAMESPACE) {
+                               if(zend_hash_find(&EG(global_namespace_ptr)->class_table, class_name_strval, class_name_strlen+1, (void **)&pce) == SUCCESS && ((*pce)->type == ZEND_USER_NAMESPACE || (*pce)->type == ZEND_INTERNAL_NAMESPACE)) {
                                        retval = SUCCESS;
                                }
                        }