Merge branch 'master' into calendar_repeat
This commit is contained in:
commit
af1cdbda72
|
@ -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){
|
||||||
|
|
Loading…
Reference in New Issue