From e8a21b3d32e1315448691cde9721b11af065ca43 Mon Sep 17 00:00:00 2001 From: Naomi Date: Mon, 16 May 2011 16:51:57 -0400 Subject: [PATCH] CC-2256 Airtime-upgrade.php does not upgrade the web app reload config method has changed. --- install/upgrades/airtime-1.8.1/airtime-upgrade.php | 3 ++- install/upgrades/airtime-1.8.2/airtime-upgrade.php | 3 ++- install/upgrades/airtime-1.8/airtime-upgrade.php | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/install/upgrades/airtime-1.8.1/airtime-upgrade.php b/install/upgrades/airtime-1.8.1/airtime-upgrade.php index 900d8f8a6..1198b7af8 100644 --- a/install/upgrades/airtime-1.8.1/airtime-upgrade.php +++ b/install/upgrades/airtime-1.8.1/airtime-upgrade.php @@ -32,7 +32,8 @@ foreach ($configFiles as $conf) { AirtimeIni::CreateIniFiles(); echo "* Initializing INI files".PHP_EOL; AirtimeIni::MergeConfigFiles($configFiles, $suffix); -Config::loadConfig(); +global $CC_CONFIG; +$CC_CONFIG = Config::loadConfig($CC_CONFIG); AirtimeInstall::InstallPhpCode(); AirtimeInstall::InstallBinaries(); diff --git a/install/upgrades/airtime-1.8.2/airtime-upgrade.php b/install/upgrades/airtime-1.8.2/airtime-upgrade.php index 900d8f8a6..1198b7af8 100644 --- a/install/upgrades/airtime-1.8.2/airtime-upgrade.php +++ b/install/upgrades/airtime-1.8.2/airtime-upgrade.php @@ -32,7 +32,8 @@ foreach ($configFiles as $conf) { AirtimeIni::CreateIniFiles(); echo "* Initializing INI files".PHP_EOL; AirtimeIni::MergeConfigFiles($configFiles, $suffix); -Config::loadConfig(); +global $CC_CONFIG; +$CC_CONFIG = Config::loadConfig($CC_CONFIG); AirtimeInstall::InstallPhpCode(); AirtimeInstall::InstallBinaries(); diff --git a/install/upgrades/airtime-1.8/airtime-upgrade.php b/install/upgrades/airtime-1.8/airtime-upgrade.php index 6563e98b4..ba4f5b631 100644 --- a/install/upgrades/airtime-1.8/airtime-upgrade.php +++ b/install/upgrades/airtime-1.8/airtime-upgrade.php @@ -61,7 +61,8 @@ AirtimeInstall::InstallBinaries(); echo "* Initializing INI files".PHP_EOL; AirtimeIni::UpdateIniFiles(); -Config::loadConfig(); +global $CC_CONFIG; +$CC_CONFIG = Config::loadConfig($CC_CONFIG); echo "* Creating default storage directory".PHP_EOL; AirtimeInstall::InstallStorageDirectory();