mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-01 22:40:39 +02:00
Code Issues Releases Wiki Activity

[feature/template-engine] Move DEBUG_EXTRA check for $recompile up.

Browse Source 
PHPBB3-9726
This commit is contained in:
Oleg Pudeyev
2011-05-11 19:25:07 -04:00
parent 504acaba6b
commit 7778771819
1 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
phpBB/includes/template.php
View File

@@ -325,15 +325,12 @@ class phpbb_template
$filename = $this->cachepath . str_replace('/', '.', $this->filename[$handle]) . '.' . $phpEx; $filename = $this->cachepath . str_replace('/', '.', $this->filename[$handle]) . '.' . $phpEx;
$this->files_template[$handle] = (isset($user->theme['template_id'])) ? $user->theme['template_id'] : 0; $this->files_template[$handle] = (isset($user->theme['template_id'])) ? $user->theme['template_id'] : 0;
$recompile = (!file_exists($filename) || @filesize($filename) === 0 || ($config['load_tplcompile'] && @filemtime($filename) < @filemtime($this->files[$handle]))) ? true : false; $recompile = defined('DEBUG_EXTRA') ||
!file_exists($filename) ||
@filesize($filename) === 0 ||
($config['load_tplcompile'] && @filemtime($filename) < @filemtime($this->files[$handle]));
if (!$recompile) if (!$recompile && $config['load_tplcompile'])
{
if (defined('DEBUG_EXTRA'))
{
$recompile = true;
}
else if ($config['load_tplcompile'])
{ {
// No way around it: we need to check inheritance here // No way around it: we need to check inheritance here
if ($user->theme['template_inherits_id'] && !file_exists($this->files[$handle])) if ($user->theme['template_inherits_id'] && !file_exists($this->files[$handle]))
@@ -343,7 +340,6 @@ class phpbb_template
} }
$recompile = (@filemtime($filename) < @filemtime($this->files[$handle])) ? true : false; $recompile = (@filemtime($filename) < @filemtime($this->files[$handle])) ? true : false;
} }
}
// Recompile page if the original template is newer, otherwise load the compiled version // Recompile page if the original template is newer, otherwise load the compiled version
if (!$recompile) if (!$recompile)