diff options
author | Daniel Opitz <danopz@users.noreply.github.com> | 2019-04-25 13:04:56 +0200 |
---|---|---|
committer | Benjamin Brahmer <info@b-brahmer.de> | 2019-04-25 13:04:56 +0200 |
commit | 10c0b1ff10fc2ada9634a87eea0b8fc0ec980bb6 (patch) | |
tree | 984c94850b89696cab291f758ea011e10c989ea0 | |
parent | 3b83d8d3cb9cd0a41e699c593399b6f5396d591b (diff) |
removed warning about non utf8mb4 charset for mysql/mariadb - #496 (#497)
Signed-off-by: Daniel Opitz <git@copynpaste.de>
-rw-r--r-- | lib/Service/StatusService.php | 10 | ||||
-rw-r--r-- | templates/part.content.warnings.php | 17 |
2 files changed, 4 insertions, 23 deletions
diff --git a/lib/Service/StatusService.php b/lib/Service/StatusService.php index e611a34ea..85be58a5d 100644 --- a/lib/Service/StatusService.php +++ b/lib/Service/StatusService.php @@ -13,8 +13,6 @@ namespace OCA\News\Service; -use Doctrine\DBAL\Platforms\MySqlPlatform; - use OCP\IConfig; use OCP\IDBConnection; @@ -22,13 +20,13 @@ use OCA\News\Config\Config; class StatusService { - + /** @var IConfig */ private $settings; + /** @var Config */ private $config; + /** @var string */ private $appName; - /** - * @var IDBConnection - */ + /** @var IDBConnection */ private $connection; public function __construct( diff --git a/templates/part.content.warnings.php b/templates/part.content.warnings.php index cdfc2f6da..e8578b299 100644 --- a/templates/part.content.warnings.php +++ b/templates/part.content.warnings.php @@ -23,20 +23,3 @@ </ul> </news-instant-notification> <?php }; ?> - -<?php if ($_['warnings']['incorrectDbCharset']) { ?> - <news-instant-notification id="cron-warning"> - <p><?php p($l->t('Non UTF-8 charset for MySQL/MariaDB database detected!')); ?></p> - <ul> - <li> - <a href="https://docs.nextcloud.com/server/latest/admin_manual/configuration_database/mysql_4byte_support.html" - target="_blank" - rel="noreferrer"> - <?php - p($l->t('Learn how to convert your database to utf8mb4 (make a backup beforehand)')); - ?> - </a> - </li> - </ul> - </news-instant-notification> -<?php }; ?> |