From 11e54bf9603472558d0e564ba2b1392c7df57c51 Mon Sep 17 00:00:00 2001 From: Naomi Date: Wed, 18 May 2011 15:22:44 -0400 Subject: [PATCH] CC-2271 1.8.2 code cleanup tasks can't seem to define globals in 1 line. --- install/upgrades/airtime-1.8.1/airtime-upgrade.php | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/install/upgrades/airtime-1.8.1/airtime-upgrade.php b/install/upgrades/airtime-1.8.1/airtime-upgrade.php index 8f36fd1f0..5e3f62f94 100644 --- a/install/upgrades/airtime-1.8.1/airtime-upgrade.php +++ b/install/upgrades/airtime-1.8.1/airtime-upgrade.php @@ -18,17 +18,21 @@ const CONF_DIR_STORAGE = "/srv/airtime"; const CONF_DIR_WWW = "/var/www/airtime"; const CONF_DIR_LOG = "/var/log/airtime"; -global $AIRTIME_SRC = __DIR__.'/../../../airtime_mvc'; -global $AIRTIME_UTILS = __DIR__.'/../../../utils'; -global $AIRTIME_PYTHON_APPS = __DIR__.'/../../../python_apps'; +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, CONF_FILE_LIQUIDSOAP); -global $CC_CONFIG; - $CC_CONFIG = array( // prefix for table names in the database 'tblNamePrefix' => 'cc_',