Fix for CRM-12428

diff --git a/CRM/Upgrade/Incremental/php/FourTwo.php b/CRM/Upgrade/Incremental/php/FourTwo.php
index 6630ac122cebaaa74f735084cb9302cf37565d54..6e31caa8c717992c2e67ce687b929d8b9f323278 100644 (file)
--- a/CRM/Upgrade/Incremental/php/FourTwo.php
+++ b/CRM/Upgrade/Incremental/php/FourTwo.php
@@ -485,6 +485,7 @@ WHERE     cpse.price_set_id IS NULL";
       $fieldParams['option_label'] = $optionValue['label'];
       $fieldParams['option_amount'] = $optionValue['value'];
       $fieldParams['option_weight'] = $optionValue['weight'];
+      $fieldParams['is_quick_config'] = $setParams['is_quick_config']; 
       if ($defaultAmount = CRM_Core_DAO::getFieldValue($daoName[$addTo[0]][0], $addTo[2], $defaultAmountColumn)) {
         $fieldParams['default_option'] = array_search($defaultAmount, $optionValue['amount_id']);
       }

diff --git a/CRM/Upgrade/Incremental/sql/4.2.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.2.alpha1.mysql.tpl
index b773ba5604ab64053217f55a4cb388fc8180de26..098f37d8af97d1b58566a1eb8823244ff0328479 100644 (file)
--- a/CRM/Upgrade/Incremental/sql/4.2.alpha1.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.2.alpha1.mysql.tpl
@@ -244,6 +244,15 @@ INSERT INTO civicrm_country (name,iso_code,region_id,is_province_abbreviated) VA
 INSERT INTO civicrm_country (name,iso_code,region_id,is_province_abbreviated) VALUES("Sint Maarten (Dutch Part)", "SX", @region_id, 0);
 INSERT INTO civicrm_country (name,iso_code,region_id,is_province_abbreviated) VALUES("Bonaire, Saint Eustatius and Saba", "BQ", @region_id, 0);
 
+-- CRM-12428
+{if $multilingual}
+    {foreach from=$locales item=locale}
+       ALTER TABLE `civicrm_price_field_value` CHANGE label_{$locale} label_{$locale} VARCHAR(255)  NULL DEFAULT NULL;
+    {/foreach}
+{else}
+       ALTER TABLE `civicrm_price_field_value` CHANGE `label` `label` VARCHAR(255)  NULL DEFAULT NULL;
+{/if}
+
 -- CRM-9714 create a default price set for contribution and membership
 ALTER TABLE `civicrm_price_set`
 ADD         `is_quick_config` TINYINT(4) NOT NULL DEFAULT '0'