aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2011-02-01 07:42:51 +0100
committerAndreas Fischer <bantu@phpbb.com>2011-02-01 07:42:51 +0100
commit8376bf28078d68ac016b7dc7bb056b4d787ec93b (patch)
tree3b5002afa4274d50342af52b9556b71962ef0bed
parentd06657c99573e3975e735e8cb7f8cc5ccb510851 (diff)
parentb414a4d107b3baa4b6d2f600e6f52211359ec3a5 (diff)
downloadforums-8376bf28078d68ac016b7dc7bb056b4d787ec93b.tar
forums-8376bf28078d68ac016b7dc7bb056b4d787ec93b.tar.gz
forums-8376bf28078d68ac016b7dc7bb056b4d787ec93b.tar.bz2
forums-8376bf28078d68ac016b7dc7bb056b4d787ec93b.tar.xz
forums-8376bf28078d68ac016b7dc7bb056b4d787ec93b.zip
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/10014] Clearly indicate fatal errors in file acm.
-rw-r--r--phpBB/includes/cache/driver/file.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/cache/driver/file.php b/phpBB/includes/cache/driver/file.php
index e26fecf534..73eaff25bd 100644
--- a/phpBB/includes/cache/driver/file.php
+++ b/phpBB/includes/cache/driver/file.php
@@ -88,11 +88,11 @@ class phpbb_cache_driver_file extends phpbb_cache_driver_base
if (!phpbb_is_writable($this->cache_dir))
{
// We need to use die() here, because else we may encounter an infinite loop (the message handler calls $cache->unload())
- die($this->cache_dir . ' is NOT writable.');
+ die('Fatal: ' . $this->cache_dir . ' is NOT writable.');
exit;
}
- die('Not able to open ' . $this->cache_dir . 'data_global.' . $phpEx);
+ die('Fatal: Not able to open ' . $this->cache_dir . 'data_global.' . $phpEx);
exit;
}