diff options
| author | Chris Smith <toonarmy@phpbb.com> | 2011-09-21 13:17:51 +0100 |
|---|---|---|
| committer | Chris Smith <toonarmy@phpbb.com> | 2011-09-21 13:17:51 +0100 |
| commit | 9d5e9af54b2bf45baa3faa6195c2c185c08a0d4e (patch) | |
| tree | 8dc2c7e9c0f6328b7519469064db91846a7f5314 /phpBB/includes | |
| parent | 25aee49ca510a4b209130d8e39d6d3f614a6ad7b (diff) | |
| download | forums-9d5e9af54b2bf45baa3faa6195c2c185c08a0d4e.tar forums-9d5e9af54b2bf45baa3faa6195c2c185c08a0d4e.tar.gz forums-9d5e9af54b2bf45baa3faa6195c2c185c08a0d4e.tar.bz2 forums-9d5e9af54b2bf45baa3faa6195c2c185c08a0d4e.tar.xz forums-9d5e9af54b2bf45baa3faa6195c2c185c08a0d4e.zip | |
[ticket/10375] Make _tpl_load() a little leaner.
- Removed duplicate variables
- Set $source_file earlier for cache checks
- Fixed useless mtime check
PHPBB3-10375
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/template/template.php | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/phpBB/includes/template/template.php b/phpBB/includes/template/template.php index d1aa67038c..e8220b25bf 100644 --- a/phpBB/includes/template/template.php +++ b/phpBB/includes/template/template.php @@ -307,35 +307,22 @@ class phpbb_template */ private function _tpl_load($handle) { - $source_file = null; - - $compiled_path = $this->_compiled_file_for_handle($handle); + $source_file = $this->locator->get_source_file_for_handle($handle); + $output_file = $this->_compiled_file_for_handle($handle); $recompile = defined('DEBUG_EXTRA') || - !file_exists($compiled_path) || - @filesize($compiled_path) === 0 || - ($this->config['load_tplcompile'] && @filemtime($compiled_path) < @filemtime($source_file)); - - if (!$recompile && $this->config['load_tplcompile']) - { - $source_file = $this->locator->get_source_file_for_handle($handle); - $recompile = (@filemtime($compiled_path) < @filemtime($source_file)) ? true : false; - } + !file_exists($output_file) || + @filesize($output_file) === 0 || + ($this->config['load_tplcompile'] && @filemtime($output_file) < @filemtime($source_file)); // Recompile page if the original template is newer, otherwise load the compiled version if (!$recompile) { - return new phpbb_template_renderer_include($compiled_path, $this); - } - - if ($source_file === null) - { - $source_file = $this->locator->get_source_file_for_handle($handle); + return new phpbb_template_renderer_include($output_file, $this); } $compile = new phpbb_template_compile($this->config['tpl_allow_php']); - $output_file = $this->_compiled_file_for_handle($handle); if ($compile->compile_file_to_file($source_file, $output_file) !== false) { $renderer = new phpbb_template_renderer_include($output_file, $this); |