Merge branch 'support/3.2' into develop

This commit is contained in:
odain
2025-11-14 10:52:27 +01:00
18 changed files with 245 additions and 136 deletions

View File

@@ -595,13 +595,13 @@ EOF;
$sMySQLCommand = $sCmd;
} else {
$sMySQLBinDir = escapeshellcmd($sMySQLBinDir);
$sMySQLCommand = '"'.$sMySQLBinDir.'/$sCmd"';
$sMySQLCommand = $sMySQLBinDir.'/'.$sCmd;
if (!file_exists($sMySQLCommand)) {
throw new BackupException("$sCmd not found in $sMySQLBinDir");
}
}
return $sMySQLCommand;
return '"'.$sMySQLCommand.'"';
}
}