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

This commit is contained in:
Naomi 2011-05-16 17:29:18 -04:00
parent 3af0b1a947
commit 5e2e3dbf05
1 changed files with 2 additions and 3 deletions

View File

@ -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);