From 146958422ed9cbfdab46c1d241e01755a64a157f Mon Sep 17 00:00:00 2001 From: Chuck Hagenbuch Date: Thu, 14 Jan 2010 17:35:23 -0500 Subject: [PATCH] It's not yet clear how these apps will manager their databse connection, so just remove the line for now. --- hippo/app/controllers/ApplicationController.php | 3 --- hydra/app/controllers/ApplicationController.php | 3 --- 2 files changed, 6 deletions(-) diff --git a/hippo/app/controllers/ApplicationController.php b/hippo/app/controllers/ApplicationController.php index 693431b2a..07d2f4dd0 100644 --- a/hippo/app/controllers/ApplicationController.php +++ b/hippo/app/controllers/ApplicationController.php @@ -14,8 +14,5 @@ class Hippo_ApplicationController extends Horde_Controller_Base */ protected function _initializeApplication() { - $GLOBALS['conf']['sql']['adapter'] = $GLOBALS['conf']['sql']['phptype'] == 'mysqli' ? 'mysqli' : 'pdo_' . $GLOBALS['conf']['sql']['phptype']; - $this->db = Horde_Db_Adapter::factory($GLOBALS['conf']['sql']); } - } diff --git a/hydra/app/controllers/ApplicationController.php b/hydra/app/controllers/ApplicationController.php index 0259c4b7e..9dd42695b 100644 --- a/hydra/app/controllers/ApplicationController.php +++ b/hydra/app/controllers/ApplicationController.php @@ -14,8 +14,5 @@ class Hydra_ApplicationController extends Horde_Controller_Base */ protected function _initializeApplication() { - $GLOBALS['conf']['sql']['adapter'] = $GLOBALS['conf']['sql']['phptype'] == 'mysqli' ? 'mysqli' : 'pdo_' . $GLOBALS['conf']['sql']['phptype']; - $this->db = Horde_Db_Adapter::factory($GLOBALS['conf']['sql']); } - } -- 2.11.0