From: Antony Dovgal <tony2001@php.net>
Date: Fri, 4 May 2007 12:17:30 +0000 (+0000)
Subject: fix disabled classes
X-Git-Tag: RELEASE_1_2_0~168
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fe6fd4ed38769515532c66e740bcdead054d3fb7;p=php

fix disabled classes
---

diff --git a/Zend/tests/errmsg_021.phpt b/Zend/tests/errmsg_021.phpt
index 99485ef26e..4e62f85111 100644
--- a/Zend/tests/errmsg_021.phpt
+++ b/Zend/tests/errmsg_021.phpt
@@ -13,4 +13,5 @@ $t = new test;
 echo "Done\n";
 ?>
 --EXPECTF--	
-Fatal error: Class 'stdclass' not found in %s on line %d
+Warning: test() has been disabled for security reasons in %s on line %d
+Done
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index df54e3b0fd..6d169e1939 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -2528,7 +2528,7 @@ ZEND_API int zend_disable_class(char *class_name, uint class_name_length TSRMLS_
 	if (zend_hash_del(CG(class_table), class_name, class_name_length+1)==FAILURE) {
 		return FAILURE;
 	}
-	INIT_CLASS_ENTRY(disabled_class, class_name, disabled_class_new);
+	INIT_OVERLOADED_CLASS_ENTRY_EX(disabled_class, class_name, class_name_length, disabled_class_new, NULL, NULL, NULL, NULL, NULL);
 	disabled_class.create_object = display_disabled_class;
 	disabled_class.name_length = class_name_length;
 	zend_register_internal_class(&disabled_class TSRMLS_CC);