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:
authorMatthieu Aubry <mattab@users.noreply.github.com>2016-12-27 12:12:10 +0300
committerGitHub <noreply@github.com>2016-12-27 12:12:10 +0300
commitcd8c762a3df4440e69c8fce1d407ef62f6f185a7 (patch)
tree7a269aa6c7f47dfe0288ea73778cd0a9418638bb /core/SettingsPiwik.php
parent3ce6d87aa1e8d772fb727413346f8e7426c38706 (diff)
When safe mode is displayed, and Super User was not logged in already, let Super User display the full safe mode to troubleshoot further (#11082)
* When safe mode is displayed, and Super User was not logged in already, let Super User display the full safe mode to troubleshoot further * meant for a different PR * Catch exceptions during CSS/Less compiling * when there's an error during Twig template processing, or during LESS css compiling, display the safe mode * Deactivate plugin as super user when authenticated with i_am_super_user * when user is not logged as Super User, Make deactivate plugin work by forwarding the i_am_super_user URL parameter * Display plugin version in safe mode fixes https://github.com/piwik/piwik/issues/11043 * Added a text to indicate users to first disable third party plugins * Updated UI test * clarify that salt is a secret * reuse helper method * minor * Catching PHP7 errors and making it work on php5
Diffstat (limited to 'core/SettingsPiwik.php')
-rw-r--r--core/SettingsPiwik.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/SettingsPiwik.php b/core/SettingsPiwik.php
index 52c4f3e16f..446712703a 100644
--- a/core/SettingsPiwik.php
+++ b/core/SettingsPiwik.php
@@ -20,7 +20,9 @@ class SettingsPiwik
const OPTION_PIWIK_URL = 'piwikUrl';
/**
- * Get salt from [General] section
+ * Get salt from [General] section. Should ONLY be used as a seed to create hashes
+ *
+ * NOTE: Keep this salt secret! Never output anywhere or share it etc.
*
* @return string
*/