From 8ff759c4be6ed0d317dc768b43f2a79213232098 Mon Sep 17 00:00:00 2001
From: CiviCRM <info@civicrm.org>
Date: Mon, 21 Dec 2015 15:25:44 -0800
Subject: [PATCH] SettingsBag - Fix bug upgrading `4.1.0-setupsh.sql.bz2` to
 4.7.beta.

---
 Civi/Core/SettingsBag.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Civi/Core/SettingsBag.php b/Civi/Core/SettingsBag.php
index 73b820fb56..05fe3a1229 100644
--- a/Civi/Core/SettingsBag.php
+++ b/Civi/Core/SettingsBag.php
@@ -371,6 +371,13 @@ class SettingsBag {
       $dao->value = serialize($value);
     }
 
+    if (!isset(\Civi::$statics[__CLASS__]['upgradeMode'])) {
+      \Civi::$statics[__CLASS__]['upgradeMode'] = \CRM_Core_Config::isUpgradeMode();
+    }
+    if (\Civi::$statics[__CLASS__]['upgradeMode'] && \CRM_Core_DAO::checkFieldExists('civicrm_setting', 'group_name')) {
+      $dao->group_name = 'placeholder';
+    }
+
     $dao->created_date = \CRM_Utils_Time::getTime('Ymdhis');
 
     $session = \CRM_Core_Session::singleton();
-- 
2.25.1