From 9c2a0864876214af4331e2145111590bd3ae6b41 Mon Sep 17 00:00:00 2001 From: drigato Date: Wed, 23 Jul 2014 15:18:46 -0400 Subject: [PATCH] CC-5895: Upgrade Propel to 1.7 Update install scripts with new propel library path --- install_minimal/include/airtime-db-install.php | 2 +- install_minimal/include/airtime-install.php | 2 +- install_minimal/include/airtime-installed-check.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/install_minimal/include/airtime-db-install.php b/install_minimal/include/airtime-db-install.php index cc1905758..084aad9a6 100644 --- a/install_minimal/include/airtime-db-install.php +++ b/install_minimal/include/airtime-db-install.php @@ -16,7 +16,7 @@ require_once(AirtimeInstall::GetAirtimeSrcDir().'/application/configs/conf.php') set_include_path(AirtimeInstall::GetAirtimeSrcDir().'/application/models' . PATH_SEPARATOR . get_include_path()); $CC_CONFIG = Config::getConfig(); -require_once 'propel/runtime/lib/Propel.php'; +require_once 'propel/vendor/propel/propel1/runtime/lib/Propel.php'; Propel::init(AirtimeInstall::GetAirtimeSrcDir()."/application/configs/airtime-conf-production.php"); //use this class to set new values in the cache as well. diff --git a/install_minimal/include/airtime-install.php b/install_minimal/include/airtime-install.php index a59baacd9..f231968b6 100644 --- a/install_minimal/include/airtime-install.php +++ b/install_minimal/include/airtime-install.php @@ -23,7 +23,7 @@ if ($iniExists) { //reinstall, Will ask if we should rewrite config files. require_once(AirtimeInstall::GetAirtimeSrcDir().'/application/configs/conf.php'); $CC_CONFIG = Config::getConfig(); - require_once 'propel/runtime/lib/Propel.php'; + require_once 'propel/vendor/propel/propel1/runtime/lib/Propel.php'; Propel::init(AirtimeInstall::GetAirtimeSrcDir()."/application/configs/airtime-conf-production.php"); $version = AirtimeInstall::GetVersionInstalled(); $newInstall = is_null($version); diff --git a/install_minimal/include/airtime-installed-check.php b/install_minimal/include/airtime-installed-check.php index 76020853b..5609675ed 100644 --- a/install_minimal/include/airtime-installed-check.php +++ b/install_minimal/include/airtime-installed-check.php @@ -22,7 +22,7 @@ if (!file_exists('/etc/airtime/airtime.conf')) { require_once(AirtimeInstall::GetAirtimeSrcDir()."/application/configs/db-conf.php"); $CC_CONFIG = Config::getConfig(); -require_once('propel/runtime/lib/Propel.php'); +require_once('propel/vendor/propel/propel1/runtime/lib/Propel.php'); Propel::init(AirtimeInstall::GetAirtimeSrcDir()."/application/configs/airtime-conf-production.php"); $version = AirtimeInstall::GetVersionInstalled();