diff options
author | mattab <matthieu.aubry@gmail.com> | 2014-05-05 07:27:18 +0400 |
---|---|---|
committer | mattab <matthieu.aubry@gmail.com> | 2014-05-05 07:27:18 +0400 |
commit | b3cac10bf7a267f211d0b4ac5c5dafe88d6803c6 (patch) | |
tree | 63116bdf2b3093ac03cc88b73608a7483ca18a49 /core/SettingsPiwik.php | |
parent | 517d0a914e37bbb174919619ed3db5ffbed442d0 (diff) |
Fixing UI tests?
Diffstat (limited to 'core/SettingsPiwik.php')
-rw-r--r-- | core/SettingsPiwik.php | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/core/SettingsPiwik.php b/core/SettingsPiwik.php index ae3782495c..c63925aada 100644 --- a/core/SettingsPiwik.php +++ b/core/SettingsPiwik.php @@ -205,7 +205,15 @@ class SettingsPiwik if (array_key_exists('installation_in_progress', $general)) { $isInstallationInProgress = (bool) $general['installation_in_progress']; } - return !$isInstallationInProgress; + if($isInstallationInProgress) { + return false; + } + + // Check that the database section is really set, ie. file is not empty + if(empty(Config::getInstance()->database['username'])) { + return false; + } + return true; } |