Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

to avoid warnings about old config file values.
This commit is contained in:
Naomi 2011-05-16 17:16:53 -04:00
parent e8a21b3d32
commit 3af0b1a947
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
install/upgrades/airtime-1.8.2/airtime-upgrade.php
View File

@ -7,8 +7,6 @@
*/
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";
@ -32,6 +30,10 @@ foreach ($configFiles as $conf) {
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);