From 9df4251058e54db7a92a468be81994aaf288209c Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 30 Apr 2008 19:00:14 +0000
Subject: [PATCH] "- fixed bug introduced with r25260: connection charset for
 PDO connection was not longer set, causing utf8 filenames written to mysql,
 which thinks we are talking latin1 (mysql default) - also fixed wrong DSN for
 mysqlt"

---
 phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php b/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
index 6bc857f692..788773f44b 100644
--- a/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
+++ b/phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
@@ -1280,7 +1280,7 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 		switch($type)
 		{
 			default:
-				$dsn = $egw_db->Type.':host='.$egw_db->Host.';port='.$egw_db->Port.';dbname='.$egw_db->Database;
+				$dsn = $type.':host='.$egw_db->Host.';port='.$egw_db->Port.';dbname='.$egw_db->Database;
 				break;
 		}
 		try {
@@ -1291,7 +1291,7 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
 		}
 		// set client charset of the connection
 		$charset = $GLOBALS['egw']->translation->charset();
-		switch($server['db_type'])
+		switch($type)
 		{
 			case 'mysql':
 				if (isset($egw_db->Link_ID->charset2mysql[$charset])) $charset = $egw_db->Link_ID->charset2mysql[$charset];