Merge branch 'master' into calendar_repeat

This commit is contained in:
Georg Ehrke 2012-06-16 17:10:49 +02:00
commit af1cdbda72
1 changed files with 1 additions and 1 deletions

View File

@ -120,7 +120,7 @@ class OC_DB {
}else{ }else{
$dsn='mysql:dbname='.$name.';host='.$host; $dsn='mysql:dbname='.$name.';host='.$host;
} }
$opts[PDO::MYSQL_ATTR_INIT_COMMAND] = "SET NAMES 'UTF8'"; $opts[PDO::MYSQL_ATTR_INIT_COMMAND] = "SET NAMES 'UTF8'; SET CHARACTER SET 'UTF8';";
break; break;
case 'pgsql': case 'pgsql':
if($port){ if($port){