From: Josh Richards <josh.t.richards@gmail.com>
Date: Fri, 10 May 2024 12:23:32 +0000 (-0400)
Subject: fix: only compare minor mariadb version differences
X-Git-Tag: v30.0.0beta1~488^2~4
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f486be8da1210c5e020180be4eed1c2ed315965a;p=nextcloud-server.git

fix: only compare minor mariadb version differences

Signed-off-by: Josh Richards <josh.t.richards@gmail.com>
---

diff --git a/apps/settings/lib/SetupChecks/SupportedDatabase.php b/apps/settings/lib/SetupChecks/SupportedDatabase.php
index d073f4f39dc..b2ae6f5a147 100644
--- a/apps/settings/lib/SetupChecks/SupportedDatabase.php
+++ b/apps/settings/lib/SetupChecks/SupportedDatabase.php
@@ -62,7 +62,9 @@ class SupportedDatabase implements ISetupCheck {
 			$row = $result->fetch();
 			$version = $row['Value'];
 			$versionlc = strtolower($version);
-
+			// we only care about X.Y not X.Y.Z differences
+			[$major, $minor, ] = explode('.', $versionlc);
+			$versionlc = $major . '.' . $minor;
 			if (str_contains($versionlc, 'mariadb')) {
 				if (version_compare($versionlc, '10.3', '<') || version_compare($versionlc, '10.11', '>')) {
 					return SetupResult::warning($this->l10n->t('MariaDB version "%s" detected. MariaDB >=10.3 and <=10.11 is suggested for best performance, stability and functionality with this version of Nextcloud.', $version));