From: Alexander Ebert <ebert@woltlab.com>
Date: Tue, 18 Jul 2017 13:34:15 +0000 (+0200)
Subject: Improved setup access, allow MariaDB 5.5.47+
X-Git-Tag: 3.0.8~25
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=643cb983031c6b2b38fc3877d4a70898b13a0f80;p=GitHub%2FWoltLab%2FWCF.git

Improved setup access, allow MariaDB 5.5.47+

Closes #2341
---

diff --git a/wcfsetup/install/files/lib/system/WCFSetup.class.php b/wcfsetup/install/files/lib/system/WCFSetup.class.php
index e4c1638211..4a0648aa94 100644
--- a/wcfsetup/install/files/lib/system/WCFSetup.class.php
+++ b/wcfsetup/install/files/lib/system/WCFSetup.class.php
@@ -667,9 +667,17 @@ class WCFSetup extends WCF {
 				$sqlVersion = $db->getVersion();
 				$compareSQLVersion = preg_replace('/^(\d+\.\d+\.\d+).*$/', '\\1', $sqlVersion);
 				if (stripos($sqlVersion, 'MariaDB')) {
-					// MariaDB 10.0.22+
-					if (!(version_compare($compareSQLVersion, '10.0.22') >= 0)) {
-						throw new SystemException("Insufficient MariaDB version '".$compareSQLVersion."'. Version '10.0.22' or greater is needed.");
+					// MariaDB 5.5.47+ or 10.0.22+ are required
+					// https://jira.mariadb.org/browse/MDEV-8756
+					if ($compareSQLVersion[0] === '5') {
+						// MariaDB 5.5.47+
+						if (!(version_compare($compareSQLVersion, '5.5.47') >= 0)) {
+							throw new SystemException("Insufficient MariaDB version '".$compareSQLVersion."'. Version '5.5.47' or greater, or version '10.0.22' or greater is needed.");
+						}
+					}
+					else if (!(version_compare($compareSQLVersion, '10.0.22') >= 0)) {
+						// MariaDB 10.0.22+
+						throw new SystemException("Insufficient MariaDB version '".$compareSQLVersion."'. Version '5.5.47' or greater, or version '10.0.22' or greater is needed.");
 					}
 				}
 				else {
diff --git a/wcfsetup/setup/lang/setup_de.xml b/wcfsetup/setup/lang/setup_de.xml
index 3fe00c4411..a4c1fa8052 100644
--- a/wcfsetup/setup/lang/setup_de.xml
+++ b/wcfsetup/setup/lang/setup_de.xml
@@ -23,9 +23,9 @@
 		<item name="wcf.global.systemRequirements.element.recommended"><![CDATA[Empfohlen]]></item>
 		<item name="wcf.global.systemRequirements.php"><![CDATA[Installierte Version der Skriptsprache „PHP“]]></item>
 		<item name="wcf.global.systemRequirements.php.description"><![CDATA[Die installierte Version der Skriptsprache „PHP“ ist für einen stabilen Betrieb dieser Software zu alt. Bitte veranlassen Sie eine Aktualisierung der installierten Version bevor Sie mit der Installation fortfahren.]]></item>
-		<item name="wcf.global.systemRequirements.sql"><![CDATA[Datenbank-Unterstützung]]></item>
+		<item name="wcf.global.systemRequirements.sql"><![CDATA[PDO-Unterstützung]]></item>
 		<item name="wcf.global.systemRequirements.sql.notFound"><![CDATA[nicht gefunden]]></item>
-		<item name="wcf.global.systemRequirements.sql.description"><![CDATA[Ohne die Unterstützung einer kompatiblen Datenbank kann diese Software nicht installiert werden.]]></item>
+		<item name="wcf.global.systemRequirements.sql.description"><![CDATA[Ohne die „pdo_mysql“ PHP-Erweiterung kann diese Software nicht installiert werden.]]></item>
 		<item name="wcf.global.systemRequirements.uploadMaxFilesize"><![CDATA[Maximale Größe für das Hochladen von Dateien]]></item>
 		<item name="wcf.global.systemRequirements.uploadMaxFilesize.description"><![CDATA[Die derzeitige Konfiguration der Skriptsprache „PHP“ macht das Hochladen von Dateien unmöglich. Einige Funktionalitäten werden durch diese Konfiguration nur eingeschränkt funktionieren.]]></item>
 		<item name="wcf.global.systemRequirements.gdLib"><![CDATA[Installierte Version der Grafikbearbeitungs-Bibliothek „gdlib“]]></item>
diff --git a/wcfsetup/setup/lang/setup_en.xml b/wcfsetup/setup/lang/setup_en.xml
index 56236e8207..7756c83e30 100644
--- a/wcfsetup/setup/lang/setup_en.xml
+++ b/wcfsetup/setup/lang/setup_en.xml
@@ -23,9 +23,9 @@
 		<item name="wcf.global.systemRequirements.element.recommended"><![CDATA[Recommended]]></item>
 		<item name="wcf.global.systemRequirements.php"><![CDATA[Installed version of the script-language “PHP”]]></item>
 		<item name="wcf.global.systemRequirements.php.description"><![CDATA[The installed version of the script-language “PHP” is too old for a stable operation of this software. To proceed with the installation, a version update is necessary.]]></item>
-		<item name="wcf.global.systemRequirements.sql"><![CDATA[Database Support]]></item>
+		<item name="wcf.global.systemRequirements.sql"><![CDATA[PDO Support]]></item>
 		<item name="wcf.global.systemRequirements.sql.notFound"><![CDATA[not found]]></item>
-		<item name="wcf.global.systemRequirements.sql.description"><![CDATA[Database support is required to install this software.]]></item>
+		<item name="wcf.global.systemRequirements.sql.description"><![CDATA[The “pdo_mysql” PHP extension is required to install this software.]]></item>
 		<item name="wcf.global.systemRequirements.uploadMaxFilesize"><![CDATA[Maximum Size for File Uploads]]></item>
 		<item name="wcf.global.systemRequirements.uploadMaxFilesize.description"><![CDATA[The current configuration of the installed “PHP” version does not allow file uploads. Due to this configuration, some features of this software will not be available.]]></item>
 		<item name="wcf.global.systemRequirements.gdLib"><![CDATA[Installed version of the graphics library “GDLib”]]></item>
diff --git a/wcfsetup/setup/template/stepShowSystemRequirements.tpl b/wcfsetup/setup/template/stepShowSystemRequirements.tpl
index 44109156e2..a500ec29d6 100644
--- a/wcfsetup/setup/template/stepShowSystemRequirements.tpl
+++ b/wcfsetup/setup/template/stepShowSystemRequirements.tpl
@@ -56,7 +56,7 @@
 					<dd>
 						<span class="badge {if !$system.sql.result}red{else}green{/if}">
 						{if !$system.sql.result}{lang}wcf.global.systemRequirements.sql.notFound{/lang}{else}
-							MySQL 5.5.35+ / MariaDB 10.0.22+
+							pdo_mysql
 						{/if}</span>
 						{if !$system.sql.result}<small>{lang}wcf.global.systemRequirements.sql.description{/lang}</small>{/if}
 					</dd>