fixing config issues

jheathco · Jun 27, 2011 · 79b0476 · 79b0476
1 parent 3f00f05
commit 79b0476
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/classes/kohana/twig.php b/classes/kohana/twig.php
@@ -25,7 +25,7 @@ public static function instance()
 			Kohana_Twig::$config = Kohana::config('twig');
 
 			// Create the the loader
-			$loader = new Twig_Loader_Filesystem(Kohana_Twig::$config->templates, Kohana_Twig::$config->cache, Kohana_Twig::$config->auto_reload);
+			$loader = new Twig_Loader_Filesystem(Kohana_Twig::$config->templates);
 
 			// Set up Twig
 			Kohana_Twig::$instance = new Twig_Environment($loader, Kohana_Twig::$config->environment);

diff --git a/config/twig.php b/config/twig.php
@@ -8,14 +8,17 @@
 		'trim_blocks'         => FALSE,
 		'charset'             => 'utf-8',
 		'base_template_class' => 'Twig_Template',
+		'cache'               => APPPATH.'cache/twig',
+		'auto_reload'         => TRUE,
+		'strict_variables'    => FALSE,
+		'autoescape'          => TRUE,
+		'optimizations'       => -1,
 	),
 	'extensions' => array
 	(
 		// List extension class names
 	),
-	'cache'          => APPPATH.'cache/twig',
 	'templates'      => APPPATH.'views/twig',
-	'auto_reload'    => TRUE,
 	'suffix'         => '.html',
 	'context_object' => TRUE,
 );