Refs #4563 Hiding message that config is not writable, when writing to the config file is disabled anyway.

6 files changed, 9 insertions, 4 deletions

diff --git a/plugins/CoreAdminHome/Controller.php b/plugins/CoreAdminHome/Controller.php
index 5c54d371a9..60f823232b 100644
--- a/plugins/CoreAdminHome/Controller.php
+++ b/plugins/CoreAdminHome/Controller.php
@@ -318,6 +318,9 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
     {
         // Whether to display or not the general settings (cron, beta, smtp)
         $view->isGeneralSettingsAdminEnabled = self::isGeneralSettingsAdminEnabled();
+        if($view->isGeneralSettingsAdminEnabled) {
+            $this->displayWarningIfConfigFileNotWritable();
+        }
 
         $enableBrowserTriggerArchiving = Rules::isBrowserTriggerEnabled();
         $todayArchiveTimeToLive = Rules::getTodayArchiveTimeToLive();
@@ -334,7 +337,6 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
 
         $view->enableBetaReleaseCheck = Config::getInstance()->Debug['allow_upgrades_to_beta'];
         $view->mail = Config::getInstance()->mail;
-        $this->displayWarningIfConfigFileNotWritable();
     }
 
 
diff --git a/plugins/CorePluginsAdmin/Controller.php b/plugins/CorePluginsAdmin/Controller.php
index 2e494f12ad..885d2be155 100644
--- a/plugins/CorePluginsAdmin/Controller.php
+++ b/plugins/CorePluginsAdmin/Controller.php
@@ -269,7 +269,11 @@ class Controller extends Plugin\ControllerAdmin
 
         $view = new View($template);
         $this->setBasicVariablesView($view);
-        $this->displayWarningIfConfigFileNotWritable();
+
+        // If user can manage plugins+themes, display a warning if config not writable
+        if (CorePluginsAdmin::isPluginsAdminEnabled()) {
+            $this->displayWarningIfConfigFileNotWritable();
+        }
 
         $view->errorMessage = '';
 
diff --git a/plugins/CustomAlerts b/plugins/CustomAlerts
-Subproject 0326908fc05cf839cb0f38117b433b7986058e3
+Subproject 9f33d86b5615d2be7adb8e12f6d1239550c1ec0
diff --git a/plugins/PrivacyManager/Controller.php b/plugins/PrivacyManager/Controller.php
index d7746bef3a..5a39b96d71 100644
--- a/plugins/PrivacyManager/Controller.php
+++ b/plugins/PrivacyManager/Controller.php
@@ -140,7 +140,6 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
             $view->activateNonce   = Nonce::getNonce(self::ACTIVATE_DNT_NONCE);
         }
         $view->language = LanguagesManager::getLanguageCodeForCurrentUser();
-        $this->displayWarningIfConfigFileNotWritable();
         $this->setBasicVariablesView($view);
         return $view->render();
     }
diff --git a/plugins/PrivacyManager/templates/privacySettings.twig b/plugins/PrivacyManager/templates/privacySettings.twig
index 812347b29d..89ed7c0d61 100644
--- a/plugins/PrivacyManager/templates/privacySettings.twig
+++ b/plugins/PrivacyManager/templates/privacySettings.twig
@@ -177,7 +177,7 @@
                 <td width="250">&nbsp;</td>
                 <td width="500">
                     <label>{{ 'PrivacyManager_DeleteReportsOlderThan'|translate }}
-                        <input type="text" id="deleteReportsOlderThan" value="{{ deleteData.config.delete_reports_older_than }}" style="width:30px;"
+                        <input type="text" id="deleteReportsOlderThan" value="{{ deleteData.config.delete_reports_older_than }}" style="width:42px;"
                                name="deleteReportsOlderThan"/>
                         {{ 'CoreHome_PeriodMonths'|translate }}
                     </label><br/>
diff --git a/tests/PHPUnit/UI b/tests/PHPUnit/UI
-Subproject cd6dcf00f5372acf492a767a9ced5f10a41a07c
+Subproject b5614886ec0ff654b2af40ebf35c38965b4512e