From 3dc870a2dcebf8dbe4eeec8bc1f1f37e26cbf52b Mon Sep 17 00:00:00 2001 From: Seamus Lee Date: Thu, 23 Jun 2016 14:46:16 +1000 Subject: [PATCH] Fix function calling as per comment from Eileen :) --- CRM/Upgrade/Incremental/php/FourSeven.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/CRM/Upgrade/Incremental/php/FourSeven.php b/CRM/Upgrade/Incremental/php/FourSeven.php index 178c54d58f..ea7e8e9314 100644 --- a/CRM/Upgrade/Incremental/php/FourSeven.php +++ b/CRM/Upgrade/Incremental/php/FourSeven.php @@ -642,24 +642,24 @@ 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', '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."'); + 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', '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."'); + 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); } } } else { if (!CRM_Core_BAO_SchemaHandler::checkIfFieldExists('civicrm_price_field_value', 'help_pre')) { - CRM_Core_DAO::executeQuery('ALTER TABLE `civicrm_price_field_value` - ADD COLUMN `help_pre` text COLLATE utf8_unicode_ci COMMENT "Price field option pre help text."'); + CRM_Core_DAO::executeQuery("ALTER TABLE `civicrm_price_field_value` + ADD COLUMN `help_pre` text COLLATE utf8_unicode_ci COMMENT 'Price field option pre help text.'"); } if (!CRM_Core_BAO_SchemaHandler::checkIfFieldExists('civicrm_price_field_value', 'help_post')) { - CRM_Core_DAO::executeQuery('ALTER TABLE `civicrm_price_field_value` - ADD COLUMN `help_post` text COLLATE utf8_unicode_ci COMMENT "Price field option post help text."'); + CRM_Core_DAO::executeQuery("ALTER TABLE `civicrm_price_field_value` + ADD COLUMN `help_post` text COLLATE utf8_unicode_ci COMMENT 'Price field option post help text.'"); } } return TRUE; -- 2.25.1