Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

CC-4588: Airtime 2.2 upgrade does not upgrade "list_all_db_files" correctly

Browse source 
-fixed
This commit is contained in:
Martin Konecny 2012-10-17 16:45:03 -04:00
parent 7123230eea
commit e01f86c377
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
install_minimal/upgrades/airtime-2.2.0/common/UpgradeCommon.php
View file

@ -105,6 +105,12 @@ class UpgradeCommon{
self::CreateIniFiles(UpgradeCommon::CONF_BACKUP_SUFFIX);
self::MergeConfigFiles($configFiles, $suffix);
//HACK: This will fix a last minute bug we discovered with our upgrade scripts.
//Will be fixed properly in 2.3.0
$old = "list_all_db_files = 'list-all-files/format/json/api_key/%%api_key%%/dir_id/%%dir_id%%'";
$new = "list_all_db_files = 'list-all-files/format/json/api_key/%%api_key%%/dir_id/%%dir_id%%/all/%%all%%'";
exec("sed -i \"s#$old#$new#g\" /etc/airtime/api_client.cfg");
}
/**
@ -162,11 +168,13 @@ class UpgradeCommon{
foreach($sectionKeys as $sectionKey) {
if(isset($oldSettings[$section][$sectionKey])) {
self::UpdateIniValue($conf, $sectionKey, $oldSettings[$section][$sectionKey]);
self::UpdateIniValue($conf, $sectionKey,
$oldSettings[$section][$sectionKey]);
}
}
} else {
self::UpdateIniValue($conf, $section, $oldSettings[$section]);
self::UpdateIniValue($conf, $section,
$oldSettings[$section]);
}
}
}