extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-26 09:53:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

"- 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)

Browse Source 
- also fixed wrong DSN for mysqlt"
This commit is contained in:
Ralf Becker 2008-04-30 19:00:14 +00:00
parent 3e1c305a7c
commit 9df4251058
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
View File

@ -1280,7 +1280,7 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
switch($type) switch($type)
{ {
default: 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; break;
} }
try { try {
@ -1291,7 +1291,7 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
} }
// set client charset of the connection // set client charset of the connection
$charset = $GLOBALS['egw']->translation->charset(); $charset = $GLOBALS['egw']->translation->charset();
switch($server['db_type']) switch($type)
{ {
case 'mysql': case 'mysql':
if (isset($egw_db->Link_ID->charset2mysql[$charset])) $charset = $egw_db->Link_ID->charset2mysql[$charset]; if (isset($egw_db->Link_ID->charset2mysql[$charset])) $charset = $egw_db->Link_ID->charset2mysql[$charset];