diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/Config.php | 2 | ||||
| -rw-r--r-- | core/Container/ContainerFactory.php | 2 | ||||
| -rw-r--r-- | core/Filechecks.php | 6 |
3 files changed, 6 insertions, 4 deletions
diff --git a/core/Config.php b/core/Config.php index 916b43b6dd..5d4467a9fa 100644 --- a/core/Config.php +++ b/core/Config.php @@ -108,7 +108,7 @@ class Config */ public static function getGlobalConfigPath() { - return PIWIK_USER_PATH . self::DEFAULT_GLOBAL_CONFIG_PATH; + return PIWIK_DOCUMENT_ROOT . self::DEFAULT_GLOBAL_CONFIG_PATH; } /** diff --git a/core/Container/ContainerFactory.php b/core/Container/ContainerFactory.php index 07b416becb..1ae6f6a2df 100644 --- a/core/Container/ContainerFactory.php +++ b/core/Container/ContainerFactory.php @@ -72,7 +72,7 @@ class ContainerFactory $builder->addDefinitions(new IniConfigDefinitionSource($this->settings)); // Global config - $builder->addDefinitions(PIWIK_USER_PATH . '/config/global.php'); + $builder->addDefinitions(PIWIK_DOCUMENT_ROOT . '/config/global.php'); // Plugin configs $this->addPluginConfigs($builder); diff --git a/core/Filechecks.php b/core/Filechecks.php index da1990d31d..1447315bb1 100644 --- a/core/Filechecks.php +++ b/core/Filechecks.php @@ -23,7 +23,7 @@ class Filechecks if (!is_writable(PIWIK_INCLUDE_PATH . '/') || !is_writable(PIWIK_DOCUMENT_ROOT . '/index.php') || !is_writable(PIWIK_INCLUDE_PATH . '/core') || - !is_writable(PIWIK_USER_PATH . '/config/global.ini.php') + !is_writable(PIWIK_DOCUMENT_ROOT . '/config/global.ini.php') ) { return false; } @@ -40,7 +40,9 @@ class Filechecks { $resultCheck = array(); foreach ($directoriesToCheck as $directoryToCheck) { - if (!preg_match('/^' . preg_quote(PIWIK_USER_PATH, '/') . '/', $directoryToCheck)) { + if (!preg_match('/^' . preg_quote(PIWIK_USER_PATH, '/') . '/', $directoryToCheck) + && !preg_match('/^' . preg_quote(PIWIK_DOCUMENT_ROOT, '/') . '/', $directoryToCheck) + && !preg_match('/^' . preg_quote(PIWIK_INCLUDE_PATH, '/') . '/', $directoryToCheck)) { $directoryToCheck = PIWIK_USER_PATH . $directoryToCheck; } |