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 2886e4f94d31e33b0bf24f2761327d48e620a092..2ba2feb27ede80958747a069f278ba156c5a5b15 100644 (file)
--- 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 264eae1f36d55dd0d9ce5eea7782d31c44a5b847..d82c8ae125f3bba2acc5c85e0970123ceb1b2a6c 100644 (file)
--- 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