From 01ee8ba6cb27ebc4ef5aa8f65a0966c7d3a20848 Mon Sep 17 00:00:00 2001 From: Seamus Lee Date: Wed, 29 Jun 2016 16:23:16 +1000 Subject: [PATCH] Fix up upgrade and get it to rebuild multilingual schema after adding base columns --- CRM/Upgrade/Incremental/php/FourSeven.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CRM/Upgrade/Incremental/php/FourSeven.php b/CRM/Upgrade/Incremental/php/FourSeven.php index 9f675e0e16..9a7f81e160 100644 --- a/CRM/Upgrade/Incremental/php/FourSeven.php +++ b/CRM/Upgrade/Incremental/php/FourSeven.php @@ -642,15 +642,16 @@ FROM `civicrm_dashboard_contact` JOIN `civicrm_contact` WHERE civicrm_dashboard_ if ($domain->locales) { $locales = explode(CRM_Core_DAO::VALUE_SEPARATOR, $domain->locales); foreach ($locales as $locale) { - if (!CRM_Core_BAO_SchemaHandler::checkIfFieldExists("civicrm_price_field_value_{$locale}", "help_pre_{$locale}")) { + if (!CRM_Core_BAO_SchemaHandler::checkIfFieldExists("civicrm_price_field_value", "help_pre_{$locale}")) { CRM_Core_DAO::executeQuery("ALTER TABLE `civicrm_price_field_value` ADD COLUMN `help_pre_{$locale}` text COLLATE utf8_unicode_ci COMMENT 'Price field option pre help text.'", array(), TRUE, NULL, FALSE, FALSE); } - if (!CRM_Core_BAO_SchemaHandler::checkIfFieldExists("civicrm_price_field_value_{$locale}", "help_post_{$locale}")) { + if (!CRM_Core_BAO_SchemaHandler::checkIfFieldExists("civicrm_price_field_value", "help_post_{$locale}")) { CRM_Core_DAO::executeQuery("ALTER TABLE `civicrm_price_field_value` ADD COLUMN `help_post_{$locale}` text COLLATE utf8_unicode_ci COMMENT 'Price field option post help text.'", array(), TRUE, NULL, FALSE, FALSE); } } + CRM_Core_I18n_Schema::rebuildMultilingualSchema($locales, NULL); } else { if (!CRM_Core_BAO_SchemaHandler::checkIfFieldExists('civicrm_price_field_value', 'help_pre')) { -- 2.25.1