From: Marcus Boerger <helly@php.net>
Date: Mon, 27 Dec 2004 15:14:58 +0000 (+0000)
Subject: - MFH: Need to unmangle the class name here
X-Git-Tag: php-5.0.4RC1~426
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8ab7643dc6cf3790f8a4cb449ae3b92a397c517a;p=php

- MFH: Need to unmangle the class name here
---

diff --git a/Zend/zend_reflection_api.c b/Zend/zend_reflection_api.c
index ddc5fd1684..a2d0e618b5 100644
--- a/Zend/zend_reflection_api.c
+++ b/Zend/zend_reflection_api.c
@@ -2867,7 +2867,7 @@ ZEND_METHOD(reflection_property, export)
 ZEND_METHOD(reflection_property, __construct)
 {
 	zval *propname, *classname;
-	char *name_str;
+	char *name_str, *class_name, *prop_name;
 	int name_len;
 	zval *object;
 	reflection_object *intern;
@@ -2932,8 +2932,9 @@ ZEND_METHOD(reflection_property, __construct)
 	ZVAL_STRINGL(classname, ce->name, ce->name_length, 1);
 	zend_hash_update(Z_OBJPROP_P(object), "class", sizeof("class"), (void **) &classname, sizeof(zval *), NULL);
 	
+	zend_unmangle_property_name(property_info->name, &class_name, &prop_name);
 	MAKE_STD_ZVAL(propname);
-	ZVAL_STRING(propname, property_info->name, 1);
+	ZVAL_STRING(propname, prop_name, 1);
 	zend_hash_update(Z_OBJPROP_P(object), "name", sizeof("name"), (void **) &propname, sizeof(zval *), NULL);
 
 	reference = (property_reference*) emalloc(sizeof(property_reference));
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
index ddc5fd1684..a2d0e618b5 100644
--- a/ext/reflection/php_reflection.c
+++ b/ext/reflection/php_reflection.c
@@ -2867,7 +2867,7 @@ ZEND_METHOD(reflection_property, export)
 ZEND_METHOD(reflection_property, __construct)
 {
 	zval *propname, *classname;
-	char *name_str;
+	char *name_str, *class_name, *prop_name;
 	int name_len;
 	zval *object;
 	reflection_object *intern;
@@ -2932,8 +2932,9 @@ ZEND_METHOD(reflection_property, __construct)
 	ZVAL_STRINGL(classname, ce->name, ce->name_length, 1);
 	zend_hash_update(Z_OBJPROP_P(object), "class", sizeof("class"), (void **) &classname, sizeof(zval *), NULL);
 	
+	zend_unmangle_property_name(property_info->name, &class_name, &prop_name);
 	MAKE_STD_ZVAL(propname);
-	ZVAL_STRING(propname, property_info->name, 1);
+	ZVAL_STRING(propname, prop_name, 1);
 	zend_hash_update(Z_OBJPROP_P(object), "name", sizeof("name"), (void **) &propname, sizeof(zval *), NULL);
 
 	reference = (property_reference*) emalloc(sizeof(property_reference));