From 8f7c685f178912c5200b8b15684bcd19e209e08b Mon Sep 17 00:00:00 2001
From: Chuck Hagenbuch <chuck@horde.org>
Date: Mon, 25 May 2009 23:02:57 -0400
Subject: [PATCH] unset a few more DSN options that can cause PDO problems
 (#8239)

---
 framework/Db/lib/Horde/Db/Adapter/Pdo/Abstract.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/framework/Db/lib/Horde/Db/Adapter/Pdo/Abstract.php b/framework/Db/lib/Horde/Db/Adapter/Pdo/Abstract.php
index 46723cfae..885532186 100644
--- a/framework/Db/lib/Horde/Db/Adapter/Pdo/Abstract.php
+++ b/framework/Db/lib/Horde/Db/Adapter/Pdo/Abstract.php
@@ -213,7 +213,15 @@ abstract class Horde_Db_Adapter_Pdo_Abstract extends Horde_Db_Adapter_Abstract
 
         // collect options to build PDO Data Source Name (DSN) string
         $dsnOpts = $this->_config;
-        unset($dsnOpts['adapter'], $dsnOpts['username'], $dsnOpts['password']);
+        unset(
+            $dsnOpts['adapter'],
+            $dsnOpts['username'],
+            $dsnOpts['password'],
+            $dsnOpts['protocol'],
+            $dsnOpts['persistent'],
+            $dsnOpts['charset'],
+            $dsnOpts['phptype']
+        );
 
         // return DSN and user/pass for connection
         return array(
-- 
2.11.0