<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.3 |
+ | CiviCRM version 4.5 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2013 |
+ | Copyright CiviCRM LLC (c) 2004-2014 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2013
+ * @copyright CiviCRM LLC (c) 2004-2014
* $Id$
*
*/
$versionName = self::$_numberMap[$versionParts[0]] . self::$_numberMap[$versionParts[1]];
if (!array_key_exists($versionName, $incrementalPhpObject)) {
- eval("\$incrementalPhpObject['$versionName'] = new CRM_Upgrade_Incremental_php_{$versionName};");
+ $className = "CRM_Upgrade_Incremental_php_{$versionName}";
+ $incrementalPhpObject[$versionName] = new $className();
}
return $incrementalPhpObject[$versionName];
}
array(
1 => $minPhpVersion,
2 => $phpVersion,
- 3 => $latestVer,
+ 3 => $latestVer
));
}
if (CRM_Core_DAO::getGlobalSetting('thread_stack', 0) < (1024*self::MINIMUM_THREAD_STACK)) {
$error = ts('CiviCRM %1 requires MySQL thread stack >= %2k', array(
1 => $latestVer,
- 2 => self::MINIMUM_THREAD_STACK,
+ 2 => self::MINIMUM_THREAD_STACK
));
}
// callback
array('CRM_Upgrade_Form', 'doIncrementalUpgradeFinish'),
// arguments
- array($rev),
+ array($rev, $currentVer, $latestVer, $postUpgradeMessageFile),
"Finish Upgrade DB to $rev"
);
$queue->createItem($task);
* @param $latestVer string, the target (final) revision
* @param $postUpgradeMessageFile string, path of a modifiable file which lists the post-upgrade messages
*/
- static function doIncrementalUpgradeFinish(CRM_Queue_TaskContext $ctx, $rev) {
+ static function doIncrementalUpgradeFinish(CRM_Queue_TaskContext $ctx, $rev, $currentVer, $latestVer, $postUpgradeMessageFile) {
$upgrade = new CRM_Upgrade_Form();
$upgrade->setVersion($rev);
CRM_Utils_System::flushCache();
- if (version_compare($currentVer, '4.1.alpha1') >= 0) {
- CRM_Core_BAO_Setting::updateSettingsFromMetaData();
- }
+ $config = CRM_Core_Config::singleton();
+ $config->userSystem->flush();
return TRUE;
}
$params = array();
CRM_Core_BAO_ConfigSetting::add($params);
+ // CRM-12804 comment-51411 : add any missing settings
+ // at the end of upgrade
+ CRM_Core_BAO_Setting::updateSettingsFromMetaData();
+
// cleanup caches CRM-8739
$config = CRM_Core_Config::singleton();
- $config->cleanupCaches(1, FALSE);
+ $config->cleanupCaches(1);
// Rebuild all triggers and re-enable logging if needed
$logging = new CRM_Logging_Schema();