CC-5895: Upgrade Propel to 1.7

Moved composer.json to top level of repo so propel will get installed there
Updated install scripts to reflect this change
This commit is contained in:
drigato 2014-07-23 15:56:23 -04:00
parent efb2a5ea7d
commit 7490c81a8f
6 changed files with 8 additions and 4 deletions

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/vendor/propel/propel1/runtime/lib/Propel.php';
require_once '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.