CC-2621 : Support upgrades from 1.7.0
This commit is contained in:
parent
84b0f33f92
commit
8a9edb2832
|
@ -7,9 +7,7 @@
|
|||
*/
|
||||
|
||||
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');
|
||||
|
||||
global $CC_CONFIG;
|
||||
|
||||
|
@ -187,6 +185,10 @@ function MergeConfigFiles($configFiles, $suffix)
|
|||
$oldSettings['file_dir'] = '/var/tmp/airtime/pypo/files/';
|
||||
$oldSettings['tmp_dir'] = '/var/tmp/airtime/pypo/tmp/';
|
||||
}
|
||||
else if($conf === CONF_FILE_RECORDER) {
|
||||
|
||||
$oldSettings['base_recorded_files'] = '/var/tmp/airtime/show-recorder/';
|
||||
}
|
||||
|
||||
$settings = array_keys($newSettings);
|
||||
|
||||
|
|
Loading…
Reference in New Issue