Merge branch 'master' into calendar_repeat
This commit is contained in:
commit
af1cdbda72
1 changed files with 1 additions and 1 deletions
|
@ -120,7 +120,7 @@ class OC_DB {
|
|||
}else{
|
||||
$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;
|
||||
case 'pgsql':
|
||||
if($port){
|
||||
|
|
Loading…
Reference in a new issue