Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

CC-5895: Upgrade Propel to 1.7

Browse source 
Update install scripts with new propel library path
This commit is contained in:
drigato 2014-07-23 15:18:46 -04:00
parent 72841de714
commit 9c2a086487
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
install_minimal/include/airtime-db-install.php
View file

@ -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.

2
install_minimal/include/airtime-install.php
View file

@ -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);

2
install_minimal/include/airtime-installed-check.php
View file

@ -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();