diff options
| author | Guilherme Blanco <guilhermeblanco@hotmail.com> | 2015-02-12 23:19:14 +0100 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2015-02-12 23:20:19 +0100 |
| commit | 8c81d80e10e0f189307fc8ff4a8fb34bd0cb1fcb (patch) | |
| tree | 962ecf3dbea41b0d4d539a60498b6942304bd844 /Zend/zend_execute_API.c | |
| parent | a0d472e1dad4a1cb719ba56a1ca4da19fadfdfb3 (diff) | |
| download | php-git-8c81d80e10e0f189307fc8ff4a8fb34bd0cb1fcb.tar.gz | |
Made ZEND_ACC_TRAIT a saner value
CC_TRAIT valued as 0x120 is too magical to be comprehensible by others.
Diffstat (limited to 'Zend/zend_execute_API.c')
| -rw-r--r-- | Zend/zend_execute_API.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index c6a0d8f0c9..0554e31a5e 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -1395,7 +1395,7 @@ void zend_verify_abstract_class(zend_class_entry *ce) /* {{{ */ zend_function *func; zend_abstract_info ai; - if ((ce->ce_flags & ZEND_ACC_IMPLICIT_ABSTRACT_CLASS) && !(ce->ce_flags & ZEND_ACC_EXPLICIT_ABSTRACT_CLASS)) { + if ((ce->ce_flags & ZEND_ACC_IMPLICIT_ABSTRACT_CLASS) && !(ce->ce_flags & (ZEND_ACC_TRAIT | ZEND_ACC_EXPLICIT_ABSTRACT_CLASS))) { memset(&ai, 0, sizeof(ai)); ZEND_HASH_FOREACH_PTR(&ce->function_table, func) { |