From 5fdf8e638bbecc00242cc0e2cf6a11e1eadc584c Mon Sep 17 00:00:00 2001 From: "Michael J. Rubinsky" Date: Fri, 24 Dec 2010 12:24:01 -0500 Subject: [PATCH] fix DbPear factory correctly. No longer need the driverconfig check, and the recursive call leads to infinite recursion --- framework/Core/lib/Horde/Core/Factory/DbPear.php | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/framework/Core/lib/Horde/Core/Factory/DbPear.php b/framework/Core/lib/Horde/Core/Factory/DbPear.php index 36d6b6afb..158b02df6 100644 --- a/framework/Core/lib/Horde/Core/Factory/DbPear.php +++ b/framework/Core/lib/Horde/Core/Factory/DbPear.php @@ -80,16 +80,7 @@ class Horde_Core_Factory_DbPear ? $dtype : $this->getConfig($dtype); - /* Determine if we we are not using splitread or if we are using the - * base SQL config. */ - if ((($type == 'read') && empty($config['splitread'])) || - (isset($config['driverconfig']) && - ($config['driverconfig'] == 'horde'))) { - $this->_instances[$sig] = $this->create($type); - return $this->_instances[$sig]; - } - - if ($type == 'read') { + if ($type == 'read' && !empty($config['splitread'])) { $config = array_merge($config, $config['read']); } -- 2.11.0