From 34273b2ac77500d5b29134d0c787931ce03f74e6 Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Thu, 15 Dec 2016 16:13:26 -0500 Subject: [PATCH] Fix upgrade error with unknown column in option_value table --- CRM/Core/BAO/OptionGroup.php | 1 + CRM/Core/BAO/OptionValue.php | 1 + CRM/Upgrade/Incremental/php/FourSeven.php | 3 +-- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CRM/Core/BAO/OptionGroup.php b/CRM/Core/BAO/OptionGroup.php index 3dedb3740c..389732239e 100644 --- a/CRM/Core/BAO/OptionGroup.php +++ b/CRM/Core/BAO/OptionGroup.php @@ -173,6 +173,7 @@ class CRM_Core_BAO_OptionGroup extends CRM_Core_DAO_OptionGroup { public static function ensureOptionGroupExists($params) { $existingValues = civicrm_api3('OptionGroup', 'get', array( 'name' => $params['name'], + 'return' => 'id', )); if (!$existingValues['count']) { $result = civicrm_api3('OptionGroup', 'create', $params); diff --git a/CRM/Core/BAO/OptionValue.php b/CRM/Core/BAO/OptionValue.php index 0fc76b3121..6813b00223 100644 --- a/CRM/Core/BAO/OptionValue.php +++ b/CRM/Core/BAO/OptionValue.php @@ -535,6 +535,7 @@ class CRM_Core_BAO_OptionValue extends CRM_Core_DAO_OptionValue { $existingValues = civicrm_api3('OptionValue', 'get', array( 'option_group_id' => $params['option_group_id'], 'name' => $params['name'], + 'return' => 'id', )); if (!$existingValues['count']) { civicrm_api3('OptionValue', 'create', $params); diff --git a/CRM/Upgrade/Incremental/php/FourSeven.php b/CRM/Upgrade/Incremental/php/FourSeven.php index d9a32ac3db..1c434052f5 100644 --- a/CRM/Upgrade/Incremental/php/FourSeven.php +++ b/CRM/Upgrade/Incremental/php/FourSeven.php @@ -924,8 +924,7 @@ FROM `civicrm_dashboard_contact` JOIN `civicrm_contact` WHERE civicrm_dashboard_ 'civievent' => array('label' => ts('CiviEvent'), 'component_id' => 'CiviEvent'), ); foreach ($values as $name => $value) { - civicrm_api3('OptionValue', 'create', $value + array( - 'options' => array('match' => array('name', 'option_group_id')), + CRM_Core_BAO_OptionValue::ensureOptionValueExists($value + array( 'name' => $name, 'option_group_id' => 'wysiwyg_presets', )); -- 2.25.1