dave/pathfinder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor improvements in /setup root

Browse Source
This commit is contained in:
Exodus4D
2015-12-30 17:05:24 +01:00
parent c5f0af8e43
commit 602d8fee28
7 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/main/controller/setup.php
View File

@@ -635,13 +635,14 @@ class Setup extends Controller {
protected function checkDBConfig($f3, $db){
// some db like "Maria DB" have some strange version strings....
$dbVersion = $db->version();
if(strpos('maria', $dbVersion) !== 1){
$dbTempVersion = explode('-', $dbVersion);
if(count($dbTempVersion) > 2){
$dbVersion = $dbTempVersion[1];
}else{
$dbVersion = $dbTempVersion[0];
$dbVersionString = $db->version();
$dbVersionParts = explode('-', $dbVersionString);
$dbVersion = '???';
foreach($dbVersionParts as $dbVersionPart){
// check if this is a valid version number
// hint: MariaDB´s version is always the last valid version number...
if( version_compare( $dbVersionPart, '0.0.1', '>=' ) > 0 ){
$dbVersion = $dbVersionPart;
}
}