Merge pull request #3608 from Nicofuma/ticket/13829

[ticket/13829] Don't fail if the cache isn't writeable
This commit is contained in:
Marc Alexander 2015-05-20 10:53:16 +02:00
commit 466b710235

View file

@ -14,6 +14,7 @@
namespace phpbb\routing;
use Symfony\Component\Config\ConfigCache;
use Symfony\Component\Filesystem\Exception\IOException;
use Symfony\Component\Routing\Matcher\Dumper\PhpMatcherDumper;
use Symfony\Component\Routing\Generator\Dumper\PhpGeneratorDumper;
use Symfony\Component\Routing\Matcher\UrlMatcher;
@ -251,6 +252,8 @@ class router implements RouterInterface
* Creates a new dumped URL Matcher (dump it if necessary)
*/
protected function create_dumped_url_matcher()
{
try
{
$cache = new ConfigCache("{$this->phpbb_root_path}cache/{$this->environment}/url_matcher.{$this->php_ext}", defined('DEBUG'));
if (!$cache->isFresh())
@ -269,6 +272,11 @@ class router implements RouterInterface
$this->matcher = new \phpbb_url_matcher($this->context);
}
catch (IOException $e)
{
$this->create_new_url_matcher();
}
}
/**
* Creates a new URL Matcher
@ -299,6 +307,8 @@ class router implements RouterInterface
* Creates a new dumped URL Generator (dump it if necessary)
*/
protected function create_dumped_url_generator()
{
try
{
$cache = new ConfigCache("{$this->phpbb_root_path}cache/{$this->environment}/url_generator.{$this->php_ext}", defined('DEBUG'));
if (!$cache->isFresh())
@ -317,6 +327,11 @@ class router implements RouterInterface
$this->generator = new \phpbb_url_generator($this->context);
}
catch (IOException $e)
{
$this->create_new_url_generator();
}
}
/**
* Creates a new URL Generator