From e3eb8bdd78271eee000f840a221acad587f4d21a Mon Sep 17 00:00:00 2001 From: Andi Gutmans Date: Thu, 25 Mar 2004 18:00:50 +0000 Subject: [PATCH] - If __construct() is defined then it will always take precedence over - old style constructors. --- Zend/zend_compile.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 6c4c48294a..a5348d5082 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -999,8 +999,9 @@ void zend_do_begin_function_declaration(znode *function_token, znode *function_n if ((short_class_name_length == name_len) && (!memcmp(short_class_name, lcname, name_len))) { if (CG(active_class_entry)->constructor) { zend_error(E_STRICT, "Redefining already defined constructor for class %s", CG(active_class_entry)->name); + } else { + CG(active_class_entry)->constructor = (zend_function *) CG(active_op_array); } - CG(active_class_entry)->constructor = (zend_function *) CG(active_op_array); } else if ((name_len == sizeof(ZEND_CONSTRUCTOR_FUNC_NAME)-1) && (!memcmp(lcname, ZEND_CONSTRUCTOR_FUNC_NAME, sizeof(ZEND_CONSTRUCTOR_FUNC_NAME)))) { if (CG(active_class_entry)->constructor) { zend_error(E_STRICT, "Redefining already defined constructor for class %s", CG(active_class_entry)->name); -- 2.50.1