composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-24 11:08:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°7150 - Backup : on MariaDB >= 11.0.1 call mariadb-dump instead of mysqldump - fix setup

Browse Source
This commit is contained in:
Anne-Cath
2026-02-27 17:24:31 +01:00
parent 4ecf81d032
commit 7f24bcedd8
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
setup/setuputils.class.inc.php
View File

@@ -559,11 +559,14 @@ class SetupUtils
$aResult[] = new CheckResult(CheckResult::ERROR, "The PHP exec() function has been disabled on this server"); $aResult[] = new CheckResult(CheckResult::ERROR, "The PHP exec() function has been disabled on this server");
} }
MetaModel::LoadConfig(utils::GetConfig());
// availability of mysqldump // availability of mysqldump
if (empty($sMySQLBinDir) && null != MetaModel::GetConfig()) { if (empty($sMySQLBinDir) && null != MetaModel::GetConfig()) {
$sMySQLBinDir = MetaModel::GetConfig()->GetModuleSetting('itop-backup', 'mysql_bindir', ''); $sMySQLBinDir = MetaModel::GetConfig()->GetModuleSetting('itop-backup', 'mysql_bindir', '');
} }
try { try {
$oConfig = MetaModel::GetConfig();
CMDBSource::InitFromConfig($oConfig);
$sMySQLDump = DBBackup::MakeSafeMySQLCommand($sMySQLBinDir, DBBackup::GetDumpFunction()); $sMySQLDump = DBBackup::MakeSafeMySQLCommand($sMySQLBinDir, DBBackup::GetDumpFunction());
} catch (Exception $e) { } catch (Exception $e) {
$aResult[] = new CheckResult(CheckResult::ERROR, $e->getMessage()); $aResult[] = new CheckResult(CheckResult::ERROR, $e->getMessage());