Don't assume that we should use the global horde db adapter.
authorMichael J. Rubinsky <mrubinsk@horde.org>
Tue, 2 Nov 2010 23:02:11 +0000 (19:02 -0400)
committerMichael J. Rubinsky <mrubinsk@horde.org>
Tue, 2 Nov 2010 23:02:11 +0000 (19:02 -0400)
Bug: 9355

framework/Core/lib/Horde/Core/Factory/Auth.php

index 1191ddd..f9e57fc 100644 (file)
@@ -150,7 +150,11 @@ class Horde_Core_Factory_Auth
 
             case 'customsql':
             case 'sql':
-                $params['db'] = $this->_injector->getInstance('Horde_Db_Adapter');
+                if (!empty($params['driverconfig']) && $params['driverconfig'] == 'horde') {
+                    $params['db'] = $this->_injector->getInstance('Horde_Db_Adapter');
+                } else {
+                    $params['db'] = $this->_injector->getInstance('Horde_Core_Factory_Db')->create('horde', 'auth');
+                }
                 break;
             }