diff options
author | Thomas Steur <thomas.steur@googlemail.com> | 2014-02-07 10:43:27 +0400 |
---|---|---|
committer | Thomas Steur <thomas.steur@googlemail.com> | 2014-02-07 10:43:27 +0400 |
commit | d0e5faa1301164e88bb89e4681e604a2e6e659b7 (patch) | |
tree | 8c0f9758236d4945aab0be81c4297f57d87eed34 /core/Config.php | |
parent | d3a423d10a483a6f41835a4c863df7fd294c2d5c (diff) |
refs #4631 started to work on installing updates during installation in case we reuse existing tables. Problem: In case there are updates available and one of those updates writes a config the installer thinks we are already done. Therefore we do now create the config file as early as possible and before the install the updates. We create the config file once we have the database information. Also allows us to remove the db_infos session hack. While installation is in progress we set a flag in General currently named install_in_progress (tbd)
Diffstat (limited to 'core/Config.php')
-rw-r--r-- | core/Config.php | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/core/Config.php b/core/Config.php index 5878d30d9d..cd0e11b82c 100644 --- a/core/Config.php +++ b/core/Config.php @@ -284,9 +284,14 @@ class Config extends Singleton } } + public function existsLocalConfig() + { + return is_readable($this->pathLocal); + } + public function checkLocalConfigFound() { - if (!is_readable($this->pathLocal)) { + if (!$this->existsLocalConfig()) { throw new Exception(Piwik::translate('General_ExceptionConfigurationFileNotFound', array($this->pathLocal))); } } @@ -393,6 +398,7 @@ class Config extends Singleton ORDER BY date_registered ASC LIMIT 1"); if (!empty($user)) { + $user['bridge'] = 1; return $user; } } catch (Exception $e) {} |