Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/10014] Clearly indicate fatal errors in file acm.
This commit is contained in:
Andreas Fischer 2011-02-01 07:42:51 +01:00
commit 8376bf2807

View file

@ -88,11 +88,11 @@ class phpbb_cache_driver_file extends phpbb_cache_driver_base
if (!phpbb_is_writable($this->cache_dir)) 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()) // 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; 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; exit;
} }