diff options
author | Matthieu Aubry <mattab@users.noreply.github.com> | 2016-10-03 00:33:28 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-03 00:33:28 +0300 |
commit | eb30d889bc289e665491bce81bf12504c63a5b97 (patch) | |
tree | 64fee0a35f5d06532f6499c4758ad95ab622625d | |
parent | b27cbb96da5a6fd1f7ef1ef90c5c09ca1b875613 (diff) | |
parent | f6e2f550462f0ebd9c93a06a307d46c6f1273ba8 (diff) |
Merge pull request #10635 from piwik/2.x-dev2.16.3-rc3
2.16.3-rc3
-rw-r--r-- | config/global.php | 15 | ||||
-rw-r--r-- | core/Version.php | 2 |
2 files changed, 12 insertions, 5 deletions
diff --git a/config/global.php b/config/global.php index 36e04970aa..cd10f72370 100644 --- a/config/global.php +++ b/config/global.php @@ -45,10 +45,17 @@ return array( return $cache; }, 'Piwik\Cache\Backend' => function (ContainerInterface $c) { - try { - $backend = $c->get('ini.Cache.backend'); - } catch (NotFoundException $ex) { - $backend = 'chained'; // happens if global.ini.php is not available + // If Piwik is not installed yet, it's possible the tmp/ folder is not writable + // we prevent failing with an unclear message eg. coming from doctrine-cache + // by forcing to use a cache backend which always works ie. array + if(!\Piwik\SettingsPiwik::isPiwikInstalled()) { + $backend = 'array'; + } else { + try { + $backend = $c->get('ini.Cache.backend'); + } catch (NotFoundException $ex) { + $backend = 'chained'; // happens if global.ini.php is not available + } } return \Piwik\Cache::buildBackend($backend); diff --git a/core/Version.php b/core/Version.php index 15079e8aa7..39af5ee7fc 100644 --- a/core/Version.php +++ b/core/Version.php @@ -20,7 +20,7 @@ final class Version * The current Piwik version. * @var string */ - const VERSION = '2.16.3-rc2'; + const VERSION = '2.16.3-rc3'; public function isStableVersion($version) { |