From b0c120d7fdf8560a4976ed51d7fac47271c91221 Mon Sep 17 00:00:00 2001 From: Stephen Abello Date: Thu, 15 Nov 2018 15:04:44 +0100 Subject: [PATCH] =?UTF-8?q?N=C2=B01728:=20Display=20error=20on=20setup=20f?= =?UTF-8?q?or=20unsupported=20MySQL=208+=20versions=20(MariaDB=20&=20Perco?= =?UTF-8?q?na=20not=20affected)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/cmdbsource.class.inc.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/cmdbsource.class.inc.php b/core/cmdbsource.class.inc.php index fa895c8bc..fc429777a 100644 --- a/core/cmdbsource.class.inc.php +++ b/core/cmdbsource.class.inc.php @@ -418,12 +418,12 @@ class CMDBSource { $sDBVendor = static::ENUM_DB_VENDOR_MYSQL; - $sVersionComment = strtolower(static::GetServerVariable('version_comment')); - if(preg_match('/mariadb/', $sVersionComment) === 1) + $sVersionComment = static::GetServerVariable('version') . ' - ' . static::GetServerVariable('version_comment'); + if(preg_match('/mariadb/i', $sVersionComment) === 1) { $sDBVendor = static::ENUM_DB_VENDOR_MARIADB; } - else if(preg_match('/percona/', $sVersionComment) === 1) + else if(preg_match('/percona/i', $sVersionComment) === 1) { $sDBVendor = static::ENUM_DB_VENDOR_PERCONA; }