upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-26 19:32:28 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 37

Merge pull request #6364 from owncloud/backport-6302-stable6

Browse source 
Send "SET NAMES utf8" to MySQL for PHP below 5.3.6
This commit is contained in:
Thomas Müller 2013-12-13 00:56:28 -08:00
commit a48cf28e17
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
3rdparty

@ -1 +1 @@
Subproject commit 12d8399a2da01c1850ad009b1862992937f58a1a
Subproject commit 1b2e3c8f6a4c7ca37da69afea4e77947df249494

3
lib/private/db.php
View file

@ -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(