From 5e2e3dbf05329ceea6aa191eac57701b13382d3e Mon Sep 17 00:00:00 2001 From: Naomi Date: Mon, 16 May 2011 17:29:18 -0400 Subject: [PATCH] CC-2256 Airtime-upgrade.php does not upgrade the web app --- install/upgrades/airtime-1.8.2/airtime-upgrade.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/install/upgrades/airtime-1.8.2/airtime-upgrade.php b/install/upgrades/airtime-1.8.2/airtime-upgrade.php index ed85b1d31..1771548cb 100644 --- a/install/upgrades/airtime-1.8.2/airtime-upgrade.php +++ b/install/upgrades/airtime-1.8.2/airtime-upgrade.php @@ -7,6 +7,8 @@ */ set_include_path(__DIR__.'/../../../airtime_mvc/library' . PATH_SEPARATOR . get_include_path()); +require_once __DIR__.'/../../../airtime_mvc/application/configs/conf.php'; +require_once(dirname(__FILE__).'/../../include/AirtimeInstall.php'); require_once(dirname(__FILE__).'/../../include/AirtimeIni.php'); const CONF_FILE_AIRTIME = "/etc/airtime/airtime.conf"; @@ -31,9 +33,6 @@ AirtimeIni::CreateIniFiles(); echo "* Initializing INI files".PHP_EOL; AirtimeIni::MergeConfigFiles($configFiles, $suffix); - -require_once __DIR__.'/../../../airtime_mvc/application/configs/conf.php'; -require_once(dirname(__FILE__).'/../../include/AirtimeInstall.php'); global $CC_CONFIG; $CC_CONFIG = Config::loadConfig($CC_CONFIG);