From 3af0b1a9471800cc1e34959bccaa9474af2e538a Mon Sep 17 00:00:00 2001
From: Naomi <naomi@naomi-DX4840.(none)>
Date: Mon, 16 May 2011 17:16:53 -0400
Subject: [PATCH] CC-2256 Airtime-upgrade.php does not upgrade the web app

to avoid warnings about old config file values.
---
 install/upgrades/airtime-1.8.2/airtime-upgrade.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/install/upgrades/airtime-1.8.2/airtime-upgrade.php b/install/upgrades/airtime-1.8.2/airtime-upgrade.php
index 1198b7af8..ed85b1d31 100644
--- a/install/upgrades/airtime-1.8.2/airtime-upgrade.php
+++ b/install/upgrades/airtime-1.8.2/airtime-upgrade.php
@@ -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);