com php-src: Fix #68185 - Inconsistent insteadof definition: Zend/zend_inheritance.c

Commit: af3a42022b34cd595d3231a845a7d8562f4a3523 Author: Julien Pauli <jpauli@php.net> Fri, 21 Nov 2014 16:05:31 +0100 Parents: a99adfac4e30a7513d1fe69b948194644d457c11 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=af3a42022b34cd595d3231a845a7d8562f4a3523 Log: Fix #68185 - Inconsistent insteadof definition Bugs: https://bugs.php.net/68185 Changed paths: M Zend/zend_inheritance.c Diff: diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c index d577ba5..43ef220 100644 --- a/Zend/zend_inheritance.c +++ b/Zend/zend_inheritance.c @@ -1238,7 +1238,7 @@ static void zend_traits_init_trait_structures(zend_class_entry *ce TSRMLS_DC) /* /* make sure that the trait method is not from a class mentioned in exclude_from_classes, for consistency */ - if (cur_precedence->trait_method->ce == cur_precedence->exclude_from_classes[i].ce) { + if (cur_precedence->trait_method->ce == cur_precedence->exclude_from_classes[j].ce) { zend_error_noreturn(E_COMPILE_ERROR, "Inconsistent insteadof definition. " "The method %s is to be used from %s, but %s is also on the exclude list",