diff --git a/application/Bootstrap.php b/application/Bootstrap.php index c17fdc043..da674ae27 100644 --- a/application/Bootstrap.php +++ b/application/Bootstrap.php @@ -4,7 +4,7 @@ require_once (__DIR__."/configs/navigation.php"); require_once (__DIR__."/configs/ACL.php"); require_once 'propel/runtime/lib/Propel.php'; -Propel::init(__DIR__."/configs/propel-config.php"); +Propel::init(__DIR__."/configs/airtime-conf.php"); //DateTime in PHP 5.3.0+ need a default timezone set. $tz = ini_get('date.timezone') ? ini_get('date.timezone') : 'UTC'; diff --git a/application/configs/airtime-conf.php b/application/configs/airtime-conf.php index 144676b10..1fe0ecb7e 100644 --- a/application/configs/airtime-conf.php +++ b/application/configs/airtime-conf.php @@ -1,6 +1,6 @@ array ( diff --git a/application/configs/propel-config.php b/application/configs/propel-config.php deleted file mode 100644 index f8cff95c1..000000000 --- a/application/configs/propel-config.php +++ /dev/null @@ -1,20 +0,0 @@ - - array ( - 'airtime' => - array ( - 'adapter' => 'pgsql', - 'connection' => - array ( - 'dsn' => 'pgsql:host=localhost;port=5432;dbname=airtime;user=airtime;password=airtime', - ), - ), - 'default' => 'airtime', - ), - 'generator_version' => '1.5.2', -); -$conf['classmap'] = include(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'classmap-propel-config.php'); -return $conf; \ No newline at end of file