diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-11-10 23:39:00 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-11-10 23:39:00 +0100 |
| commit | 847feb07e784ccbe646257553f1efba8c5032b7f (patch) | |
| tree | 78860eb01da03d27f2c7c0c016556de596967010 /phpBB/includes/template/template.php | |
| parent | f0cfae1f014e5defd373bac74b5d915fc3568c7a (diff) | |
| parent | bd37f7f6c04780819dfa8f81b2d761b91859fd67 (diff) | |
| download | forums-847feb07e784ccbe646257553f1efba8c5032b7f.tar forums-847feb07e784ccbe646257553f1efba8c5032b7f.tar.gz forums-847feb07e784ccbe646257553f1efba8c5032b7f.tar.bz2 forums-847feb07e784ccbe646257553f1efba8c5032b7f.tar.xz forums-847feb07e784ccbe646257553f1efba8c5032b7f.zip | |
Merge remote-tracking branch 'EXreaction/ticket/11189' into develop
* EXreaction/ticket/11189:
[ticket/11189] Replace DEBUG_EXTRA with DEBUG
[ticket/11189] Always log critical errors when in cron or in image output
Diffstat (limited to 'phpBB/includes/template/template.php')
| -rw-r--r-- | phpBB/includes/template/template.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/template/template.php b/phpBB/includes/template/template.php index 36d7bc5307..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; |