From eae4b3109ed45e55aeed13d4b27a2f88c39d0f35 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Johannes=20Schl=C3=BCter?= Date: Sat, 9 Jun 2007 08:36:52 +0000 Subject: [PATCH] Fix #41640 (get_class_vars produces error on class constants) --- Zend/tests/bug41640.phpt | 15 +++++++++++++++ Zend/zend_builtin_functions.c | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 Zend/tests/bug41640.phpt diff --git a/Zend/tests/bug41640.phpt b/Zend/tests/bug41640.phpt new file mode 100644 index 0000000000..c859d90850 --- /dev/null +++ b/Zend/tests/bug41640.phpt @@ -0,0 +1,15 @@ +--TEST-- +Bug #41640 (get_class_vars produces error on class constants) +--FILE-- + + int(1) +} diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index 97fedfa18e..63a96f8588 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -815,8 +815,8 @@ ZEND_FUNCTION(get_class_vars) RETURN_FALSE; } else { array_init(return_value); - add_class_vars(*pce, &(*pce)->default_properties, return_value TSRMLS_CC); zend_update_class_constants(*pce TSRMLS_CC); + add_class_vars(*pce, &(*pce)->default_properties, return_value TSRMLS_CC); add_class_vars(*pce, CE_STATIC_MEMBERS(*pce), return_value TSRMLS_CC); } } -- 2.50.1