From f087df9bb89b45cfa2a4ddab30ce909de98d2d8e Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Tue, 2 Aug 2011 13:49:17 -0500 Subject: [PATCH] Refactor database manager. --- system/db/manager.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/system/db/manager.php b/system/db/manager.php index 9f83bb68..f830e9f3 100644 --- a/system/db/manager.php +++ b/system/db/manager.php @@ -29,14 +29,12 @@ public static function connection($connection = null) if ( ! array_key_exists($connection, static::$connections)) { - $config = Config::get('db.connections'); - - if ( ! array_key_exists($connection, $config)) + if (is_null($config = Config::get('db.connections.'.$connection))) { throw new \Exception("Database connection [$connection] is not defined."); } - static::$connections[$connection] = new Connection($connection, (object) $config[$connection], new Connector); + static::$connections[$connection] = new Connection($connection, (object) $config, new Connector); } return static::$connections[$connection];