fixed unit test, updated CHANGELOG

diff --git a/CHANGELOG b/CHANGELOG
index 684d4d3..6f02247 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,6 @@
 * 1.1.2
 
+ * fixed json_encode filter on PHP 5.2
  * fixed regression introduced in 1.1.1 ({{ block(foo|lower) }})
  * fixed inheritance when using conditional parents
  * fixed compilation of templates when the body of a child template is not empty

diff --git a/lib/Twig/Extension/Core.php b/lib/Twig/Extension/Core.php
index 9013a83..671becb 100644 (file)
--- a/lib/Twig/Extension/Core.php
+++ b/lib/Twig/Extension/Core.php
@@ -251,8 +251,7 @@ function twig_urlencode_filter($url, $raw = false)
     return urlencode($url);
 }
 
-if (version_compare(PHP_VERSION, '5.3.0', '<'))
-{
+if (version_compare(PHP_VERSION, '5.3.0', '<')) {
     /**
      * JSON encodes a PHP variable.
      *