diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-05-11 19:32:32 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-05-12 20:13:31 -0400 |
| commit | 7638bcb56011ebde65005a0ce1abfe7f4a6be4b7 (patch) | |
| tree | 1e05a7262b6f2120b4a79e862ff09878b371ee4a | |
| parent | 77787718196c05b98efccec668c4a9762591398f (diff) | |
| download | forums-7638bcb56011ebde65005a0ce1abfe7f4a6be4b7.tar forums-7638bcb56011ebde65005a0ce1abfe7f4a6be4b7.tar.gz forums-7638bcb56011ebde65005a0ce1abfe7f4a6be4b7.tar.bz2 forums-7638bcb56011ebde65005a0ce1abfe7f4a6be4b7.tar.xz forums-7638bcb56011ebde65005a0ce1abfe7f4a6be4b7.zip | |
[feature/template-engine] Rename $filename to $compiled_path for clarity.
PHPBB3-9726
| -rw-r--r-- | phpBB/includes/template.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/phpBB/includes/template.php b/phpBB/includes/template.php index 865535cfd5..2ebbca3568 100644 --- a/phpBB/includes/template.php +++ b/phpBB/includes/template.php @@ -322,13 +322,13 @@ class phpbb_template // by other template class instances in between. $user->theme['template_inherits_id'] = $this->orig_tpl_inherits_id; - $filename = $this->cachepath . str_replace('/', '.', $this->filename[$handle]) . '.' . $phpEx; + $compiled_path = $this->cachepath . str_replace('/', '.', $this->filename[$handle]) . '.' . $phpEx; $this->files_template[$handle] = (isset($user->theme['template_id'])) ? $user->theme['template_id'] : 0; $recompile = defined('DEBUG_EXTRA') || - !file_exists($filename) || - @filesize($filename) === 0 || - ($config['load_tplcompile'] && @filemtime($filename) < @filemtime($this->files[$handle])); + !file_exists($compiled_path) || + @filesize($compiled_path) === 0 || + ($config['load_tplcompile'] && @filemtime($compiled_path) < @filemtime($this->files[$handle])); if (!$recompile && $config['load_tplcompile']) { @@ -338,13 +338,13 @@ class phpbb_template $this->files[$handle] = $this->files_inherit[$handle]; $this->files_template[$handle] = $user->theme['template_inherits_id']; } - $recompile = (@filemtime($filename) < @filemtime($this->files[$handle])) ? true : false; + $recompile = (@filemtime($compiled_path) < @filemtime($this->files[$handle])) ? true : false; } // Recompile page if the original template is newer, otherwise load the compiled version if (!$recompile) { - return new phpbb_template_renderer_include($filename, $this); + return new phpbb_template_renderer_include($compiled_path, $this); } // Inheritance - we point to another template file for this one. |