Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormattab <matthieu.aubry@gmail.com>2014-05-05 01:51:13 +0400
committermattab <matthieu.aubry@gmail.com>2014-05-05 01:51:13 +0400
commitdc30088078a0f4e526f79a0a9424fed512e5e4c7 (patch)
tree1929c48b068fa2fc8507ae5e91c2b124d6e8df6a /core/SettingsPiwik.php
parent55f068240fdf22ed134c6ec483d8fd36091312b8 (diff)
Refs #4990 Fix bug reported in forums when nFS is detected
http://forum.piwik.org/read.php?8,114216,page=1#msg-114795
Diffstat (limited to 'core/SettingsPiwik.php')
-rw-r--r--core/SettingsPiwik.php13
1 files changed, 12 insertions, 1 deletions
diff --git a/core/SettingsPiwik.php b/core/SettingsPiwik.php
index 969e21a3d6..ae3782495c 100644
--- a/core/SettingsPiwik.php
+++ b/core/SettingsPiwik.php
@@ -195,7 +195,18 @@ class SettingsPiwik
$exists = file_exists($config);
// Piwik is installed if the config file is found
- return $exists;
+ if(!$exists) {
+ return false;
+ }
+
+ $general = Config::getInstance()->General;
+
+ $isInstallationInProgress = false;
+ if (array_key_exists('installation_in_progress', $general)) {
+ $isInstallationInProgress = (bool) $general['installation_in_progress'];
+ }
+ return !$isInstallationInProgress;
+
}
/**