From: Nileema <nileema@nileema.(none)>
Date: Fri, 10 Jan 2014 06:00:00 +0000 (+0530)
Subject: -- CRM-14056 Fix for Multi-lingual 4.4.4 upgrade fails due to dashboard upgrade
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=9359d28c759187bb76ce60eadd65e4254c170f6b;p=civicrm-core.git

-- CRM-14056 Fix for Multi-lingual 4.4.4 upgrade fails due to dashboard upgrade

----------------------------------------
* CRM-14056: Multi-lingual 4.4.4 upgrade fails due to dashboard upgrade
  http://issues.civicrm.org/jira/browse/CRM-14056
---

diff --git a/CRM/Upgrade/Incremental/php/FourFour.php b/CRM/Upgrade/Incremental/php/FourFour.php
index dcfffb6674..d180a8f064 100644
--- a/CRM/Upgrade/Incremental/php/FourFour.php
+++ b/CRM/Upgrade/Incremental/php/FourFour.php
@@ -250,18 +250,10 @@ WHERE a.id IS NULL;
     // task to process sql
     $this->addTask(ts('Upgrade DB to %1: SQL', array(1 => '4.4.4')), 'task_4_4_x_runSql', $rev);
 
-    // Consolidate activity contacts CRM-12274.
-    $this->addTask('Dashboard schema', 'dashboard');
-
-    return TRUE;
-  }
-
-  static function dashboard(CRM_Queue_TaskContext $ctx) {
-    $upgrade = new CRM_Upgrade_Form();
     $query = "
 ALTER TABLE civicrm_dashboard
     ADD name varchar(64) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'Internal name of dashlet.' AFTER domain_id ";
-    CRM_Core_DAO::executeQuery($query);
+    CRM_Core_DAO::executeQuery($query, array(), TRUE, NULL, FALSE, FALSE);
 
     $dashboard = new CRM_Core_DAO_Dashboard();
     $dashboard->find();
@@ -286,8 +278,8 @@ ALTER TABLE civicrm_dashboard
   {$values}
   END;
     ";
+    CRM_Core_DAO::executeQuery($query, array(), TRUE, NULL, FALSE, FALSE);
 
-    CRM_Core_DAO::executeQuery($query);
     return TRUE;
   }