From 4e06eadadfd23f28010713ab43cc80dbddbc8322 Mon Sep 17 00:00:00 2001
From: Thomas Steur <tsteur@users.noreply.github.com>
Date: Mon, 7 May 2018 07:29:11 +1200
Subject: Fix always all plugin settings are saved (#12827)

---
 plugins/CorePluginsAdmin/API.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'plugins/CorePluginsAdmin')

diff --git a/plugins/CorePluginsAdmin/API.php b/plugins/CorePluginsAdmin/API.php
index b2f27d32bc..d00c8c2ba9 100644
--- a/plugins/CorePluginsAdmin/API.php
+++ b/plugins/CorePluginsAdmin/API.php
@@ -49,7 +49,9 @@ class API extends \Piwik\Plugin\API
 
         try {
             foreach ($pluginsSettings as $pluginSetting) {
-                $pluginSetting->save();
+                if (!empty($settingValues[$pluginSetting->getPluginName()])) {
+                    $pluginSetting->save();
+                }
             }
         } catch (Exception $e) {
             throw new Exception(Piwik::translate('CoreAdminHome_PluginSettingsSaveFailed'));
@@ -71,7 +73,9 @@ class API extends \Piwik\Plugin\API
 
         try {
             foreach ($pluginsSettings as $pluginSetting) {
-                $pluginSetting->save();
+                if (!empty($settingValues[$pluginSetting->getPluginName()])) {
+                    $pluginSetting->save();
+                }
             }
         } catch (Exception $e) {
             throw new Exception(Piwik::translate('CoreAdminHome_PluginSettingsSaveFailed'));
-- 
cgit v1.2.3