aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorNathaniel Guse <nathaniel.guse@gmail.com>2013-07-01 13:32:43 -0500
committerNathaniel Guse <nathaniel.guse@gmail.com>2013-07-01 13:32:43 -0500
commit793ee3f8d9d1ccc971d7b7118b981463b7de0938 (patch)
treeb49b1ad3a3e00c6e3e944b0e0ba8e1f61ad2989d /phpBB
parentbdc05b7dc8ee2363dfe1a7fa70bc4118140ed351 (diff)
downloadforums-793ee3f8d9d1ccc971d7b7118b981463b7de0938.tar
forums-793ee3f8d9d1ccc971d7b7118b981463b7de0938.tar.gz
forums-793ee3f8d9d1ccc971d7b7118b981463b7de0938.tar.bz2
forums-793ee3f8d9d1ccc971d7b7118b981463b7de0938.tar.xz
forums-793ee3f8d9d1ccc971d7b7118b981463b7de0938.zip
[feature/twig] Remove debug code, set debug/auto reload correctly
PHPBB3-11598
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/includes/template/twig/twig.php8
1 files changed, 2 insertions, 6 deletions
diff --git a/phpBB/includes/template/twig/twig.php b/phpBB/includes/template/twig/twig.php
index 1d36ceadba..377a0a47a8 100644
--- a/phpBB/includes/template/twig/twig.php
+++ b/phpBB/includes/template/twig/twig.php
@@ -120,16 +120,12 @@ class phpbb_template_twig implements phpbb_template
$loader,
array(
'cache' => $this->cachepath,
- 'debug' => true, // @todo
- 'auto_reload' => true, // @todo
+ 'debug' => defined('DEBUG'),
+ 'auto_reload' => (bool) $this->config['load_tplcompile'],
'autoescape' => false,
)
);
- // Clear previous cache files (while WIP)
- // @todo remove
- $this->clear_cache();
-
$this->twig->addExtension(
new phpbb_template_twig_extension(
$this->user