com php-src: Fixed condition: Zend/zend_compile.c
| From: | Dmitry Stogov | Date: | Mon, 03 Sep 2018 11:50:35 +0000 |
| Subject: | com php-src: Fixed condition: Zend/zend_compile.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-102970@lists.php.net to get a copy of this message | ||
Commit: 887e126240acc71359429c79f485959d5c9a4a86
Author: Dmitry Stogov <dmitry@zend.com> Mon, 3 Sep 2018 14:50:35 +0300
Parents: f543476e899d5b1f0df5aac15758c4e0db18cb17
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=887e126240acc71359429c79f485959d5c9a4a86
Log:
Fixed condition
Changed paths:
M Zend/zend_compile.c
Diff:
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 45e154c..5831f66 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -6346,7 +6346,7 @@ void zend_compile_class_decl(zend_ast *ast, zend_bool toplevel) /* {{{ */
zend_class_entry *parent_ce = zend_lookup_class_ex(ce->parent_name, NULL, 0);
if (parent_ce
- && ((parent_ce->type != ZEND_INTERNAL_CLASS) || (CG(compiler_options) &
ZEND_COMPILE_IGNORE_INTERNAL_CLASSES))
+ && ((parent_ce->type != ZEND_INTERNAL_CLASS) || !(CG(compiler_options) &
ZEND_COMPILE_IGNORE_INTERNAL_CLASSES))
&& ((parent_ce->type != ZEND_USER_CLASS) || !(CG(compiler_options) &
ZEND_COMPILE_IGNORE_OTHER_FILES) || (parent_ce->info.user.filename == ce->info.user.filename))
) {
if (EXPECTED(zend_hash_add_ptr(CG(class_table), lcname, ce) != NULL)) {