From 774b4b685297736ff0336e02602dfd0277545ca2 Mon Sep 17 00:00:00 2001 From: sonologic Date: Wed, 31 May 2017 20:12:09 +0200 Subject: Fix #163, use IDBConnection->supports4ByteText() (#169) Instead of the buggy StatusService->hasIncorrectCharset, use the already available IDBConnection->supports4ByteText() to determine if 4byte unicode is supported. --- lib/Service/StatusService.php | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/lib/Service/StatusService.php b/lib/Service/StatusService.php index 066c63ff3..31011be9f 100644 --- a/lib/Service/StatusService.php +++ b/lib/Service/StatusService.php @@ -59,15 +59,9 @@ class StatusService { 'version' => $version, 'warnings' => [ 'improperlyConfiguredCron' => !$this->isProperlyConfigured(), - 'incorrectDbCharset' => $this->hasIncorrectCharset() + 'incorrectDbCharset' => !$this->connection->supports4ByteText() ] ]; } - public function hasIncorrectCharset() { - $charset = $this->connection->getParams()['charset']; - $platform = $this->connection->getDatabasePlatform(); - return $platform instanceof MySqlPlatform && $charset !== 'utf8mb4'; - } - -} \ No newline at end of file +} -- cgit v1.2.3