diff --git a/web/configs/version.json b/web/configs/version.json index 48147b0dc..4381e44d1 100644 --- a/web/configs/version.json +++ b/web/configs/version.json @@ -1,5 +1,5 @@ { "version": "1.8.0", - "git": "1411", + "git": "1412", "dev": true } diff --git a/web/install/template/page.3.php b/web/install/template/page.3.php index 3f6ea1151..745e0acf6 100644 --- a/web/install/template/page.3.php +++ b/web/install/template/page.3.php @@ -15,7 +15,7 @@ } ?> -

This page will list all of the requirements to run the SourceBans web interface, and compare them with your current values. This page will also list some recomendations. These aren't required to run SourceBans web interface, but they are highly recomended.

+

This page will list all of the requirements to run the SourceBans web interface, and compare them with your current values. This page will also list some recomendations. These aren't required to run SourceBans web interface, but they are highly recommended.

@@ -25,7 +25,7 @@
PHP Requirements
- + @@ -130,7 +130,7 @@
SettingRecomendedRecommended Required Your Value
- + @@ -139,28 +139,29 @@ = MariaDB 10.0.5 ( https://mariadb.com/kb/en/full-text-index-overview/ ) - if (strpos($sql_version, 'MARIADB') !== false){ - //we have a mariadb. - //check for versions below 10.0.5 - if(version_compare($sql_version, "10.0.5", "<")){ - $class = "red"; - $errors++; - }else{ - $class = "green"; - } - }else{ - //other DB (presumably mysql) - //check for stuff lower then 5.5 - if(version_compare($sql_version, "5.5", "<")) { - $class = "red"; - $errors++; - }else{ - $class = "green"; + if (!empty($sql_version) && strpos($sql_version, 'MARIADB') !== false) { + if (version_compare($sql_version, '10.0.5') != -1) { + $class = "green"; + } else { + $class = "red"; + $errors++; } - } + } + // other DB (presumably mysql) - check for stuff lower then 5.5 + elseif (!empty($sql_version) && strpos($sql_version, '5.5') != -1 || strpos($sql_version, '10.0.5') != -1) { + $class = "green"; + } else { + $class = "red"; + $errors++; + } ?> @@ -176,7 +177,7 @@
SettingRecomendedRecommended Required Your Value
N/A Mysql 5.5 or MariaDB 10.0.5
- +
SettingRecomendedRecommended Required Your Value