summaryrefslogtreecommitdiffstats
path: root/apps/settings
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2021-04-22 09:47:57 +0200
committerGitHub <noreply@github.com>2021-04-22 09:47:57 +0200
commita54eaeaaffbd9a4046afc4b0b6e9b8c8f8b27d67 (patch)
tree0e4748c854f6044f9013b6ad541d63188e67137f /apps/settings
parentb5bbf0021df81784613eb9f3b1e89ceac2de2888 (diff)
parentc0bd4302468cf9638d27c3d9d48976cc39c9e201 (diff)
downloadnextcloud-server-a54eaeaaffbd9a4046afc4b0b6e9b8c8f8b27d67.tar.gz
nextcloud-server-a54eaeaaffbd9a4046afc4b0b6e9b8c8f8b27d67.zip
Merge pull request #26685 from nextcloud/backport/26474/stable21
[stable21] Mention MariaDB in MySQL support warning
Diffstat (limited to 'apps/settings')
-rw-r--r--apps/settings/lib/SetupChecks/SupportedDatabase.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/settings/lib/SetupChecks/SupportedDatabase.php b/apps/settings/lib/SetupChecks/SupportedDatabase.php
index 11227fc236f..ba43fb84550 100644
--- a/apps/settings/lib/SetupChecks/SupportedDatabase.php
+++ b/apps/settings/lib/SetupChecks/SupportedDatabase.php
@@ -74,7 +74,7 @@ class SupportedDatabase {
}
} else {
if (version_compare($version, '8', '<')) {
- $this->description = $this->l10n->t('MySQL version "%s" is used. Nextcloud 21 will no longer support this version and requires MySQL 8 or higher.', $row['Value']);
+ $this->description = $this->l10n->t('MySQL version "%s" is used. Nextcloud 21 will no longer support this version and requires MySQL 8.0 or MariaDB 10.2 or higher.', $row['Value']);
return;
}
}