From: Andrei Zmievski <andrei@php.net>
Date: Tue, 1 Apr 2003 21:02:02 +0000 (+0000)
Subject: Stas's patch on zend_execute.c (1.448 -> 1.449) resulted in a bug where
X-Git-Tag: RELEASE_0_5~217
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1ad9bd68ff33085a3ec2c2c408dc8528908c79c5;p=php

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 88274c8e17..fbb8c491c2 100644
--- 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;
 				}
 			}