diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2012-11-11 04:42:06 -0600 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2012-11-11 04:42:06 -0600 |
| commit | 84ba10ec8c023ab307eb7d0b829ab337aaaae78e (patch) | |
| tree | 468abf9fbb513cba53803ca29c6b65fd4ea497ec /phpBB/includes/template/template.php | |
| parent | 106daa09ebb5b12bf9892c41f8c1de627cf6b0e9 (diff) | |
| parent | e86ecc0f3bd6383d31a670896720a970b8faaaa9 (diff) | |
| download | forums-84ba10ec8c023ab307eb7d0b829ab337aaaae78e.tar forums-84ba10ec8c023ab307eb7d0b829ab337aaaae78e.tar.gz forums-84ba10ec8c023ab307eb7d0b829ab337aaaae78e.tar.bz2 forums-84ba10ec8c023ab307eb7d0b829ab337aaaae78e.tar.xz forums-84ba10ec8c023ab307eb7d0b829ab337aaaae78e.zip | |
Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103
Diffstat (limited to 'phpBB/includes/template/template.php')
| -rw-r--r-- | phpBB/includes/template/template.php | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/phpBB/includes/template/template.php b/phpBB/includes/template/template.php index 5d3ce4c82b..8a7dc6b2f3 100644 --- a/phpBB/includes/template/template.php +++ b/phpBB/includes/template/template.php @@ -250,7 +250,7 @@ class phpbb_template * If template cache is writable the compiled php code will be stored * on filesystem and template will not be subsequently recompiled. * If template cache is not writable template source will be recompiled - * every time it is needed. DEBUG_EXTRA define and load_tplcompile + * every time it is needed. DEBUG define and load_tplcompile * configuration setting may be used to force templates to be always * recompiled. * @@ -268,7 +268,7 @@ class phpbb_template { $output_file = $this->_compiled_file_for_handle($handle); - $recompile = defined('DEBUG_EXTRA') || + $recompile = defined('DEBUG') || !file_exists($output_file) || @filesize($output_file) === 0; @@ -538,7 +538,11 @@ class phpbb_template // Locate file if ($locate) { - $file = $this->locator->get_first_file_location(array($file), true, true); + $located = $this->locator->get_first_file_location(array($file), false, true); + if ($located) + { + $file = $located; + } } else if ($relative) { |