wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Correctly save and pass on the charset

Browse source 
Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2016-10-18 10:22:02 +02:00 committed by Morris Jobke
parent d294ef23dd
commit 9356a0e583
No known key found for this signature in database
GPG key ID: 9CE5ED29E7FCD38A
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/private/DB/ConnectionFactory.php
View file

@ -67,7 +67,7 @@ class ConnectionFactory {
public function __construct(IConfig $config) {
if($config->getSystemValue('mysql.utf8mb4', false)) {
$defaultConnectionParams['mysql']['charset'] = 'utf8mb4';
$this->defaultConnectionParams['mysql']['charset'] = 'utf8mb4';
}
}
@ -106,7 +106,9 @@ class ConnectionFactory {
case 'mysql':
// Send "SET NAMES utf8". Only required on PHP 5.3 below 5.3.6.
// See http://stackoverflow.com/questions/4361459/php-pdo-charset-set-names#4361485
$eventManager->addEventSubscriber(new MysqlSessionInit);
$eventManager->addEventSubscriber(new MysqlSessionInit(
$this->defaultConnectionParams['mysql']['charset']
));
$eventManager->addEventSubscriber(
new SQLSessionInit("SET SESSION AUTOCOMMIT=1"));
break;