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:
authorThomas Steur <thomas.steur@gmail.com>2016-03-10 00:55:45 +0300
committerThomas Steur <thomas.steur@gmail.com>2016-04-11 05:11:33 +0300
commitb52ae4e7e488e0474d67c54578e1d6c1aa066bff (patch)
treef94b02f774cbc24faaa18f29ee1e19fef8b338af /plugins/Diagnostics/Controller.php
parent6ba622a68a26792af8cc22131f488f7ff5189d2c (diff)
refs #7983 let plugins add or remove fields to websites and better settings api
Diffstat (limited to 'plugins/Diagnostics/Controller.php')
-rw-r--r--plugins/Diagnostics/Controller.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/plugins/Diagnostics/Controller.php b/plugins/Diagnostics/Controller.php
index 7d2341a195..a350ff47a3 100644
--- a/plugins/Diagnostics/Controller.php
+++ b/plugins/Diagnostics/Controller.php
@@ -10,6 +10,7 @@ namespace Piwik\Plugins\Diagnostics;
use Piwik\Config;
use Piwik\Piwik;
+use Piwik\Plugin\SettingsProvider;
use Piwik\View;
use Piwik\Settings;
@@ -30,10 +31,11 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
{
Piwik::checkUserHasSuperUserAccess();
- $allSettings = Settings\Manager::getAllPluginSettings();
+ $settings = new SettingsProvider(\Piwik\Plugin\Manager::getInstance());
+ $allSettings = $settings->getAllSystemSettings();
$configValues = $this->configReader->getConfigValuesFromFiles();
- $configValues = $this->configReader->addConfigValuesFromPluginSettings($configValues, $allSettings);
+ $configValues = $this->configReader->addConfigValuesFromSystemSettings($configValues, $allSettings);
$configValues = $this->sortConfigValues($configValues);
return $this->renderTemplate('configfile', array(