diff --git a/airtime_mvc/application/configs/conf.php b/airtime_mvc/application/configs/conf.php index 68e1b1cba..76b94f429 100644 --- a/airtime_mvc/application/configs/conf.php +++ b/airtime_mvc/application/configs/conf.php @@ -58,8 +58,8 @@ class Config { } public static function setAirtimeVersion() { - $airtime_version = Application_Model_Preference::GetAirtimeVersion(); - $uniqueid = Application_Model_Preference::GetUniqueId(); + $airtime_version = Application_Model_Preference::GetAirtimeVersion(); + $uniqueid = Application_Model_Preference::GetUniqueId(); self::$CC_CONFIG['airtime_version'] = md5($airtime_version.$uniqueid); } diff --git a/install_minimal/include/airtime-db-install.php b/install_minimal/include/airtime-db-install.php index d404c6b88..f99bb1cb3 100644 --- a/install_minimal/include/airtime-db-install.php +++ b/install_minimal/include/airtime-db-install.php @@ -10,7 +10,7 @@ require_once(__DIR__.'/AirtimeInstall.php'); require_once(__DIR__.'/airtime-constants.php'); require_once(AirtimeInstall::GetAirtimeSrcDir().'/application/configs/conf.php'); -Config::loadConfig(); +Config::loadConfig(); $CC_CONFIG = Config::getConfig(); require_once 'propel/runtime/lib/Propel.php'; Propel::init(AirtimeInstall::GetAirtimeSrcDir()."/application/configs/airtime-conf-production.php"); diff --git a/install_minimal/include/airtime-install.php b/install_minimal/include/airtime-install.php index 45836c4c4..e67c3f6f2 100644 --- a/install_minimal/include/airtime-install.php +++ b/install_minimal/include/airtime-install.php @@ -16,7 +16,7 @@ $iniExists = file_exists("/etc/airtime/airtime.conf"); if ($iniExists){ //reinstall, Will ask if we should rewrite config files. require_once(AirtimeInstall::GetAirtimeSrcDir().'/application/configs/conf.php'); - Config::loadConfig(); + Config::loadConfig(); $CC_CONFIG = Config::getConfig(); require_once 'propel/runtime/lib/Propel.php'; Propel::init(AirtimeInstall::GetAirtimeSrcDir()."/application/configs/airtime-conf-production.php"); @@ -53,7 +53,7 @@ if ($overwrite) { } if (!$iniExists){ require_once(AirtimeInstall::GetAirtimeSrcDir().'/application/configs/conf.php'); - Config::loadConfig(); + Config::loadConfig(); $CC_CONFIG = Config::getConfig(); require_once 'propel/runtime/lib/Propel.php'; Propel::init(AirtimeInstall::GetAirtimeSrcDir()."/application/configs/airtime-conf-production.php");