aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Guse <nathaniel.guse@gmail.com>2012-07-30 16:23:18 -0500
committerNathan Guse <nathaniel.guse@gmail.com>2012-07-30 16:23:18 -0500
commit2c1da15ae83e292d3aa9c94f740d6bff6bfd238e (patch)
tree20c6df7986a9e89339f70f85e051957337cc60ec
parent17681c0770e3a3fb7a4b0ef74e4038c6de787119 (diff)
downloadforums-2c1da15ae83e292d3aa9c94f740d6bff6bfd238e.tar
forums-2c1da15ae83e292d3aa9c94f740d6bff6bfd238e.tar.gz
forums-2c1da15ae83e292d3aa9c94f740d6bff6bfd238e.tar.bz2
forums-2c1da15ae83e292d3aa9c94f740d6bff6bfd238e.tar.xz
forums-2c1da15ae83e292d3aa9c94f740d6bff6bfd238e.zip
[ticket/11029] Cache obtain_cfg_items should return empty array on failure
continue was used where it should not have been, causing a fatal error This file is loaded on every page to check if style.cfg has changed. If it has not, the user is not affected, so if it does not exist, the user should not be affected either. PHPBB3-11029
-rw-r--r--phpBB/includes/cache/service.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/cache/service.php b/phpBB/includes/cache/service.php
index 37f32aa753..5946241825 100644
--- a/phpBB/includes/cache/service.php
+++ b/phpBB/includes/cache/service.php
@@ -337,7 +337,7 @@ class phpbb_cache_service
if (!file_exists($filename))
{
- continue;
+ return array();
}
if (!isset($parsed_array['filetime']) || (($config['load_tplcompile'] && @filemtime($filename) > $parsed_array['filetime'])))