updated CHANGELOG

This commit is contained in:
Fabien Potencier
2015-09-06 08:45:56 +02:00
parent 542dd3acc0
commit 825bdc1afc
2 changed files with 3 additions and 2 deletions
+2 -1
View File
@@ -1,6 +1,7 @@
* 1.21.2 (2015-XX-XX)
* n/a
* added Traversable support for replace, merge, and sort
* deprecated support for character by character replacement for the "replace" filter
* 1.21.1 (2015-08-26)
+1 -1
View File
@@ -563,7 +563,7 @@ function twig_replace_filter($str, $from, $to = null)
if ($from instanceof Traversable) {
$from = iterator_to_array($from);
} elseif (is_string($from) && is_string($to)) {
@trigger_error('Using "replace" with character by character replacement is deprecated and will be removed in Twig 2.x', E_USER_DEPRECATED);
@trigger_error('Using "replace" with character by character replacement is deprecated and will be removed in Twig 2.0', E_USER_DEPRECATED);
return strtr($str, $from, $to);
} elseif (!is_array($from)) {