From: monishdeb <monish.deb@webaccess.co.in>
Date: Wed, 16 Oct 2013 13:48:47 +0000 (+0530)
Subject: CRM-13601 fix -  Multilingual upgrade 4.3.5 to 4.4 beta throws up an error
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=d427e40e19f68e0912983f8b649c318d88e32edc;p=civicrm-core.git

CRM-13601 fix -  Multilingual upgrade 4.3.5 to 4.4 beta throws up an error

http://issues.civicrm.org/jira/browse/CRM-13601
---

diff --git a/CRM/Upgrade/Incremental/php/FourFour.php b/CRM/Upgrade/Incremental/php/FourFour.php
index 2886e4f94d..2ba2feb27e 100644
--- a/CRM/Upgrade/Incremental/php/FourFour.php
+++ b/CRM/Upgrade/Incremental/php/FourFour.php
@@ -82,7 +82,7 @@ class CRM_Upgrade_Incremental_php_FourFour {
 
     // add new 'data' column in civicrm_batch
     $query = 'ALTER TABLE civicrm_batch ADD data LONGTEXT NULL COMMENT "cache entered data"';
-    CRM_Core_DAO::executeQuery($query);
+    CRM_Core_DAO::executeQuery($query, array(), TRUE, NULL, FALSE, FALSE);
 
     // check if batch entry data exists in civicrm_cache table
     $query = 'SELECT path, data FROM civicrm_cache WHERE group_name = "batch entry"';
diff --git a/CRM/Upgrade/Incremental/sql/4.4.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.4.alpha1.mysql.tpl
index 264eae1f36..d82c8ae125 100644
--- a/CRM/Upgrade/Incremental/sql/4.4.alpha1.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.4.alpha1.mysql.tpl
@@ -137,8 +137,13 @@ ALTER TABLE civicrm_survey
   ADD is_share TINYINT( 4 ) NULL DEFAULT '1' COMMENT 'Can people share the petition through social media?';
 
 -- CRM-12439
-ALTER TABLE `civicrm_uf_group`
-  ADD `description` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT 'Optional verbose description of the profile.' AFTER `title`;
+{if $multilingual}
+  ALTER TABLE `civicrm_uf_group`
+    ADD `description` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT 'Optional verbose description of the profile.' AFTER `group_type`;
+{else}
+  ALTER TABLE `civicrm_uf_group`
+    ADD `description` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT 'Optional verbose description of the profile.' AFTER `title`;
+{/if}
 
 --CRM-13142
 UPDATE