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:
Diffstat (limited to 'plugins/CoreAdminHome/Controller.php')
-rw-r--r--plugins/CoreAdminHome/Controller.php7
1 files changed, 4 insertions, 3 deletions
diff --git a/plugins/CoreAdminHome/Controller.php b/plugins/CoreAdminHome/Controller.php
index 21aeaa4cc8..2e5cf517b5 100644
--- a/plugins/CoreAdminHome/Controller.php
+++ b/plugins/CoreAdminHome/Controller.php
@@ -99,12 +99,12 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
{
Piwik::checkUserIsNotAnonymous();
- $view = new View('@CoreAdminHome/pluginSettings');
-
$settings = SettingsManager::getPluginSettingsForCurrentUser();
ksort($settings);
+
+ $view = new View('@CoreAdminHome/pluginSettings');
$view->pluginSettings = $settings;
- $view->nonce = Nonce::getNonce(static::SET_PLUGIN_SETTINGS_NONCE);
+ $view->nonce = Nonce::getNonce(static::SET_PLUGIN_SETTINGS_NONCE);
$this->setBasicVariablesView($view);
@@ -152,6 +152,7 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
}
} catch (Exception $e) {
+ // TODO escape message
echo json_encode(array('result' => 'error', 'message' => $e->getMessage()));
return;
}