Skip to content
Snippets Groups Projects
Commit ac6c22d7 authored by lobo's avatar lobo
Browse files

Merge pull request #1800 from monishdeb/CRM-13601

CRM-13601 fix -  Multilingual upgrade 4.3.5 to 4.4 beta throws up an err...
parents fef8e662 d427e40e
No related branches found
No related tags found
No related merge requests found
...@@ -82,7 +82,7 @@ class CRM_Upgrade_Incremental_php_FourFour { ...@@ -82,7 +82,7 @@ class CRM_Upgrade_Incremental_php_FourFour {
// add new 'data' column in civicrm_batch // add new 'data' column in civicrm_batch
$query = 'ALTER TABLE civicrm_batch ADD data LONGTEXT NULL COMMENT "cache entered data"'; $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 // check if batch entry data exists in civicrm_cache table
$query = 'SELECT path, data FROM civicrm_cache WHERE group_name = "batch entry"'; $query = 'SELECT path, data FROM civicrm_cache WHERE group_name = "batch entry"';
......
...@@ -137,8 +137,13 @@ ALTER TABLE civicrm_survey ...@@ -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?'; ADD is_share TINYINT( 4 ) NULL DEFAULT '1' COMMENT 'Can people share the petition through social media?';
-- CRM-12439 -- CRM-12439
ALTER TABLE `civicrm_uf_group` {if $multilingual}
ADD `description` TEXT CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT 'Optional verbose description of the profile.' AFTER `title`; 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 --CRM-13142
UPDATE UPDATE
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment