<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.6.alpha1 |
+ | CiviCRM version 4.7.alpha1 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2015 |
+--------------------------------------------------------------------+
* alterable.
* @param string $rev
* an intermediate version; note that setPostUpgradeMessage is called repeatedly with different $revs.
- * @return void
*/
public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) {
if ($rev == '4.6.alpha1') {
public function upgrade_4_6_6($rev) {
// CRM-16846 - This sql file may have been previously skipped. Conditionally run it again if it doesn't appear to have run before.
if (!CRM_Core_DAO::singleValueQuery("SELECT id FROM civicrm_state_province WHERE abbreviation = '100' AND country_id = 1193")) {
- $this->addTask('Update Slovenian municipalities', 'runSql', '4.6.alpha3');
+ $this->addTask('Update Slovenian municipalities', 'task_4_6_x_runOnlySql', '4.6.alpha3');
}
// CRM-16846 - This sql file may have been previously skipped. No harm in running it again because it's just UPDATE statements.
- $this->addTask('State-province update from 4.4.7', 'runSql', '4.4.7');
+ $this->addTask('State-province update from 4.4.7', 'task_4_6_x_runOnlySql', '4.4.7');
$this->addTask(ts('Upgrade DB to %1: SQL', array(1 => $rev)), 'runSql', $rev);
}
return TRUE;
}
+ /**
+ * Queue Task Callback for CRM-16846
+ *
+ * Run a sql file without resetting locale to that version
+ */
+ public static function task_4_6_x_runOnlySql(CRM_Queue_TaskContext $ctx, $rev) {
+ $upgrade = new CRM_Upgrade_Form();
+ $smarty = CRM_Core_Smarty::singleton();
+ $smarty->assign('domainID', CRM_Core_Config::domainID());
+
+ $fileName = dirname(__DIR__) . "/sql/$rev.mysql.tpl";
+
+ $upgrade->source($smarty->fetch($fileName), TRUE);
+
+ return TRUE;
+ }
+
}