From: Tim Otten <totten@civicrm.org>
Date: Fri, 6 Mar 2015 04:38:26 +0000 (-0800)
Subject: CRM-16063 - Mailing Component - Reset is_default when making a new default
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=736eccb6d859f36893ea36a3bfe5a130df804723;p=civicrm-core.git

CRM-16063 - Mailing Component - Reset is_default when making a new default
---

diff --git a/CRM/Mailing/BAO/Component.php b/CRM/Mailing/BAO/Component.php
index 55dd8b35fb..853dc3454a 100644
--- a/CRM/Mailing/BAO/Component.php
+++ b/CRM/Mailing/BAO/Component.php
@@ -98,8 +98,13 @@ class CRM_Mailing_BAO_Component extends CRM_Mailing_DAO_Component {
       $component->body_text = CRM_Utils_String::htmlToText(CRM_Utils_Array::value('body_html', $params));
     }
 
-    if ($component->is_default && !empty($id)) {
-      CRM_Core_DAO::executeQuery("UPDATE civicrm_mailing_component SET is_default = 0 WHERE component_type ='{$component->component_type}' AND id <> $id");
+    if ($component->is_default) {
+      if (!empty($id)) {
+        CRM_Core_DAO::executeQuery("UPDATE civicrm_mailing_component SET is_default = 0 WHERE component_type ='{$component->component_type}' AND id <> $id");
+      }
+      else {
+        CRM_Core_DAO::executeQuery("UPDATE civicrm_mailing_component SET is_default = 0 WHERE component_type ='{$component->component_type}'");
+      }
     }
 
     $component->save();