From 66af605697c40ec457d9726c6afa4b3998e3ea4c Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Wed, 11 Dec 2013 00:13:40 +0100 Subject: [PATCH 1/2] Send "SET NAMES utf8" to MySQL for PHP below 5.3.6 --- lib/private/db.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/private/db.php b/lib/private/db.php index 1e5d12649df..562065259fa 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( From cd7c974fb68120f6fd77ad39e663e896ae8dd725 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Fri, 13 Dec 2013 00:03:20 +0100 Subject: [PATCH 2/2] Updated 3rdparty ref --- 3rdparty | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rdparty b/3rdparty index 12d8399a2da..1b2e3c8f6a4 160000 --- a/3rdparty +++ b/3rdparty @@ -1 +1 @@ -Subproject commit 12d8399a2da01c1850ad009b1862992937f58a1a +Subproject commit 1b2e3c8f6a4c7ca37da69afea4e77947df249494