From: Tim Otten <totten@civicrm.org>
Date: Thu, 27 Aug 2015 23:01:08 +0000 (-0700)
Subject: CRM_Core_BAO_Setting::dao() - Don't filter on group, but do save a blank group.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=b391b97b1b90416c3233cd0c37d7718c22caca75;p=civicrm-core.git

CRM_Core_BAO_Setting::dao() - Don't filter on group, but do save a blank group.
---

diff --git a/CRM/Core/BAO/Setting.php b/CRM/Core/BAO/Setting.php
index 72a4aaaba8..4f0b8f7838 100644
--- a/CRM/Core/BAO/Setting.php
+++ b/CRM/Core/BAO/Setting.php
@@ -176,7 +176,9 @@ class CRM_Core_BAO_Setting extends CRM_Core_DAO_Setting {
     }
     $dao = new CRM_Core_DAO_Setting();
 
-    $dao->group_name = $group;
+    if (!empty($group)) {
+      $dao->group_name = $group;
+    }
     $dao->name = $name;
     $dao->component_id = $componentID;
     if (empty($domainID)) {
@@ -370,6 +372,7 @@ class CRM_Core_BAO_Setting extends CRM_Core_DAO_Setting {
 
     $dao = self::dao($group, $name, $componentID, $contactID, $domainID);
     $dao->find(TRUE);
+    $dao->group_name = $group;
 
     if (isset($metadata['on_change'])) {
       foreach ($metadata['on_change'] as $callback) {