From 0d0cdba3bb239efa20a0bd0c4a890a41d529d672 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 1 Oct 2014 19:13:04 +0200 Subject: [PATCH] udpated CHANGELOG --- CHANGELOG | 1 + lib/Twig/Extension/Core.php | 1 - 2 files changed, 1 insertions(+), 1 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index eda7311..a4239da 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,6 @@ * 1.16.1 (2014-XX-XX) + * sped up the slice filter * fixed for mb function overload mb_substr acting different * fixed the attribute() function when passing a variable for the arguments diff --git a/lib/Twig/Extension/Core.php b/lib/Twig/Extension/Core.php index b8953fc..959b590 100644 --- a/lib/Twig/Extension/Core.php +++ b/lib/Twig/Extension/Core.php @@ -692,7 +692,6 @@ function twig_array_merge($arr1, $arr2) function twig_slice(Twig_Environment $env, $item, $start, $length = null, $preserveKeys = false) { if ($item instanceof Traversable) { - if ($item instanceof IteratorAggregate) { $item = $item->getIterator(); } -- 1.7.2.5