summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsonologic <gmc@sonologic.nl>2017-05-31 20:12:09 +0200
committerBernhard Posselt <BernhardPosselt@users.noreply.github.com>2017-05-31 20:12:09 +0200
commit774b4b685297736ff0336e02602dfd0277545ca2 (patch)
tree8e803ba8b8c67cc6cc4a1711e8d0d159f869cce4
parent88753100b42d1b2c460146fabc640f73b553e0d8 (diff)
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.
-rw-r--r--lib/Service/StatusService.php10
1 files 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
+}