diff options
author | Matthieu Aubry <mattab@users.noreply.github.com> | 2016-07-21 05:09:46 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-21 05:09:46 +0300 |
commit | afd490ae730db7f75240289c203dde1abd2035dc (patch) | |
tree | 7751f29de812a6ccd0440ab7632866e7adbdbff5 /core/Db.php | |
parent | 870465c6041cfdc344e89fb7878357638bfad1c6 (diff) |
When Piwik config file becomes un-readable, make it clear that the file still exists but is not readable (#10331)
* * In messages, make it more clear whether config file exists and/or is (not) readable
* When the config file exists but is not readable, provide users the choice between making the file readable, or starting a fresh install
* As long as Piwik is not installed, piwik.php should not return 500 when config file is not readable
* Fixes #10283
* UI tests: updated message when config file is not found
Diffstat (limited to 'core/Db.php')
-rw-r--r-- | core/Db.php | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/core/Db.php b/core/Db.php index a4b114d634..b906790397 100644 --- a/core/Db.php +++ b/core/Db.php @@ -57,6 +57,12 @@ class Db return self::$connection; } + /** + * Returns an array with the Database connection information. + * + * @param array|null $dbConfig + * @return array + */ public static function getDatabaseConfig($dbConfig = null) { $config = Config::getInstance(); |