Merge branch '2.x-twig'

1 files changed, 2 insertions, 6 deletions

diff --git a/core/Twig.php b/core/Twig.php
index a0347e910d..ab6822fd33 100644
--- a/core/Twig.php
+++ b/core/Twig.php
@@ -41,7 +41,8 @@ class Piwik_Twig
         $this->twig = new Twig_Environment($chainLoader,
             array(
                  'debug' => true, // to use {{ dump(var) }} in twig templates
-                //'cache' => PIWIK_DOCUMENT_ROOT . '/tmp/templates_c',
+                 'strict_variables' => true, // throw an exception if variables are invalid
+                 'cache' => PIWIK_DOCUMENT_ROOT . '/tmp/templates_c',
             )
         );
         $this->twig->addExtension(new Twig_Extension_Debug());
@@ -53,11 +54,6 @@ class Piwik_Twig
         $this->addFilter_money();
         $this->addFilter_truncate();
         $this->twig->addFilter( new Twig_SimpleFilter('implode', 'implode'));
-        $this->twig->addFilter( new Twig_SimpleFilter('count', 'count'));
-        /*
-        $this->load_filter('output', 'cachebuster');
-        $this->load_filter('output', 'trimwhitespace');*/
-
 
         $this->addFunction_includeAssets();
         $this->addFunction_linkTo();