CC-2621 : Support upgrades from 1.7.0

This commit is contained in:
Naomi Aro 2011-08-03 12:40:19 +02:00 committed by James
parent 634bb9bcd5
commit 7e0684cb6d
3 changed files with 48 additions and 25 deletions

View file

@ -18,16 +18,9 @@ const CONF_DIR_STORAGE = "/srv/airtime";
const CONF_DIR_WWW = "/var/www/airtime";
const CONF_DIR_LOG = "/var/log/airtime";
global $AIRTIME_SRC;
global $AIRTIME_UTILS;
global $AIRTIME_PYTHON_APPS;
global $CC_CONFIG;
$AIRTIME_SRC = __DIR__.'/../../../airtime_mvc';
$AIRTIME_UTILS = __DIR__.'/../../../utils';
$AIRTIME_PYTHON_APPS = __DIR__.'/../../../python_apps';
$configFiles = array(CONF_FILE_AIRTIME,
CONF_FILE_PYPO,
CONF_FILE_RECORDER,
@ -48,7 +41,7 @@ $CC_CONFIG = array(
'phingPath' => dirname(__FILE__).'/../../library/phing'
);
//$CC_CONFIG = Config::loadConfig($CC_CONFIG);
$CC_CONFIG = LoadConfig($CC_CONFIG);
// Add database table names
$CC_CONFIG['playListTable'] = $CC_CONFIG['tblNamePrefix'].'playlist';