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

Commit: cd3b46f28af49e5eaaa687d5d186e641ce147853 Author: Julien Pauli <jpauli@php.net> Wed, 29 Oct 2014 14:39:48 +0100 Parents: 59a9e7af215fb2411035f8d75386acbb38cd8e83 Branches: PHP-5.5 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=cd3b46f28af49e5eaaa687d5d186e641ce147853 Log: Fix #68185 - Inconsistent insteadof definition Bugs: https://bugs.php.net/68185 Changed paths: M Zend/zend_compile.c Diff: diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index bd3e1dd..6e19128 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -4116,7 +4116,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]) { + if (cur_precedence->trait_method->ce == cur_precedence->exclude_from_classes[j]) { zend_error(E_COMPILE_ERROR, "Inconsistent insteadof definition. " "The method %s is to be used from %s, but %s is also on the exclude list",