summaryrefslogtreecommitdiff
path: root/inc/template.php
diff options
context:
space:
mode:
authorczaks <marcin@6irc.net>2013-08-29 07:33:19 -0400
committerczaks <marcin@6irc.net>2013-08-29 07:33:19 -0400
commit8de81d176cc379687abbfebc3daa72e96068d49a (patch)
tree87e79f53ea13449b76944dd93a17e2a10d56da91 /inc/template.php
parentb61772361cd124c665a9356630936d8f8b4a352b (diff)
parent738179c766953fa45670e451875210c6874a41f2 (diff)
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts: inc/config.php
Diffstat (limited to 'inc/template.php')
-rw-r--r--inc/template.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/inc/template.php b/inc/template.php
index 6f85e78b..6d417631 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -35,7 +35,7 @@ function load_twig() {
}
function Element($templateFile, array $options) {
- global $config, $debug, $twig;
+ global $config, $debug, $twig, $build_pages;
if (!$twig)
load_twig();
@@ -51,6 +51,8 @@ function Element($templateFile, array $options) {
unset($debug['start']);
unset($debug['start_debug']);
}
+ if ($config['try_smarter'] && isset($build_pages) && !empty($build_pages))
+ $debug['build_pages'] = $build_pages;
$debug['included'] = get_included_files();
$debug['memory'] = round(memory_get_usage(true) / (1024 * 1024), 2) . ' MiB';
$options['body'] .=