CC-2256 Airtime-upgrade.php does not upgrade the web app

reload config method has changed.
This commit is contained in:
Naomi 2011-05-16 16:51:57 -04:00
parent d169dd96e2
commit e8a21b3d32
3 changed files with 6 additions and 3 deletions

View File

@ -32,7 +32,8 @@ foreach ($configFiles as $conf) {
AirtimeIni::CreateIniFiles(); AirtimeIni::CreateIniFiles();
echo "* Initializing INI files".PHP_EOL; echo "* Initializing INI files".PHP_EOL;
AirtimeIni::MergeConfigFiles($configFiles, $suffix); AirtimeIni::MergeConfigFiles($configFiles, $suffix);
Config::loadConfig(); global $CC_CONFIG;
$CC_CONFIG = Config::loadConfig($CC_CONFIG);
AirtimeInstall::InstallPhpCode(); AirtimeInstall::InstallPhpCode();
AirtimeInstall::InstallBinaries(); AirtimeInstall::InstallBinaries();

View File

@ -32,7 +32,8 @@ foreach ($configFiles as $conf) {
AirtimeIni::CreateIniFiles(); AirtimeIni::CreateIniFiles();
echo "* Initializing INI files".PHP_EOL; echo "* Initializing INI files".PHP_EOL;
AirtimeIni::MergeConfigFiles($configFiles, $suffix); AirtimeIni::MergeConfigFiles($configFiles, $suffix);
Config::loadConfig(); global $CC_CONFIG;
$CC_CONFIG = Config::loadConfig($CC_CONFIG);
AirtimeInstall::InstallPhpCode(); AirtimeInstall::InstallPhpCode();
AirtimeInstall::InstallBinaries(); AirtimeInstall::InstallBinaries();

View File

@ -61,7 +61,8 @@ AirtimeInstall::InstallBinaries();
echo "* Initializing INI files".PHP_EOL; echo "* Initializing INI files".PHP_EOL;
AirtimeIni::UpdateIniFiles(); AirtimeIni::UpdateIniFiles();
Config::loadConfig(); global $CC_CONFIG;
$CC_CONFIG = Config::loadConfig($CC_CONFIG);
echo "* Creating default storage directory".PHP_EOL; echo "* Creating default storage directory".PHP_EOL;
AirtimeInstall::InstallStorageDirectory(); AirtimeInstall::InstallStorageDirectory();