From: Tim Otten <totten@civicrm.org>
Date: Mon, 17 Aug 2015 23:51:16 +0000 (-0700)
Subject: CRM_Admin_Form_Setting - Report errors in saving settings
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=af96269923b39c6051e6b786de7fb04b1c75f409;p=civicrm-core.git

CRM_Admin_Form_Setting - Report errors in saving settings
---

diff --git a/CRM/Admin/Form/Setting.php b/CRM/Admin/Form/Setting.php
index 56116fdf0b..6486759e5d 100644
--- a/CRM/Admin/Form/Setting.php
+++ b/CRM/Admin/Form/Setting.php
@@ -269,6 +269,10 @@ AND    time_format <> ''
       //@todo array_diff this
       unset($params[$setting]);
     }
+    if (!empty($result['error_message'])) {
+      CRM_Core_Session::setStatus($result['error_message'], ts('Save Failed'), 'error');
+    }
+
     CRM_Core_BAO_ConfigSetting::create($params);
 
     CRM_Core_Config::clearDBCache();