diff options
author | Bart Visscher <bartv@thisnet.nl> | 2013-12-16 22:38:22 +0100 |
---|---|---|
committer | Bart Visscher <bartv@thisnet.nl> | 2013-12-16 22:38:22 +0100 |
commit | 8f0c56c1b245ed7c6856080597b48ef3d82d1a24 (patch) | |
tree | f87bc926726f9aeaa1692bc94355951e7d9f28a2 /lib/private/db.php | |
parent | 7afe6b349352f90bec5a8409bf5c23494f808f1a (diff) | |
parent | 77b68505c2164330803ce5d5dcbb9fd07438e18d (diff) | |
download | nextcloud-server-8f0c56c1b245ed7c6856080597b48ef3d82d1a24.tar.gz nextcloud-server-8f0c56c1b245ed7c6856080597b48ef3d82d1a24.zip |
Merge branch 'master' into fix-5388-master
Diffstat (limited to 'lib/private/db.php')
-rw-r--r-- | lib/private/db.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/private/db.php b/lib/private/db.php index 237925a5921..723c1ee07a3 100644 --- a/lib/private/db.php +++ b/lib/private/db.php @@ -101,6 +101,9 @@ class OC_DB { ); $connectionParams['adapter'] = '\OC\DB\Adapter'; $connectionParams['wrapperClass'] = 'OC\DB\Connection'; + // 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 \Doctrine\DBAL\Event\Listeners\MysqlSessionInit); break; case 'pgsql': $connectionParams = array( |