From: Michael J. Rubinsky <mrubinsk@horde.org>
Date: Wed, 3 Nov 2010 04:07:47 +0000 (-0400)
Subject: Don't pollute the DSN with non-connection related data.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=5c148f95a10d2626e5004cffab0aff3af7a37959;p=horde.git

Don't pollute the DSN with non-connection related data.

Not sure if there's a better place to do this or not...if so, happy to
move it.

Bug: 9355
---

diff --git a/framework/Core/lib/Horde/Core/Factory/Db.php b/framework/Core/lib/Horde/Core/Factory/Db.php
index 7c5c17e2b..6fab12775 100644
--- a/framework/Core/lib/Horde/Core/Factory/Db.php
+++ b/framework/Core/lib/Horde/Core/Factory/Db.php
@@ -85,6 +85,19 @@ class Horde_Core_Factory_Db
             return $this->_instances[$sig];
         }
 
+        // Prevent DSN from getting polluted
+        if ($type == 'auth' && $conf['driver'] == 'custom') {
+            unset($conf['query_auth'],
+                  $conf['query_add'],
+                  $conf['query_getpw'],
+                  $conf['query_update'],
+                  $conf['query_resetpassword'],
+                  $conf['query_remove'],
+                  $conf['query_list'],
+                  $conf['query_exists'],
+                  $conf['encryption'],
+                  $conf['show_encryption']);
+        }
         try {
             $this->_instances[$sig] = $this->_createDb($config);
         } catch (Horde_Exception $e) {