fix testing MySQLBinDir

favincen · jf-cbd · commit 8527eec0f82c · 2025-11-12T09:37:05.000+01:00
diff --git a/setup/backup.class.inc.php b/setup/backup.class.inc.php
@@ -595,13 +595,13 @@ public static function MakeSafeMySQLCommand($sMySQLBinDir, string $sCmd)
 			$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.'"';
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -595,13 +595,13 @@ public static function MakeSafeMySQLCommand($sMySQLBinDir, string $sCmd)`
`595`	`595`	`$sMySQLCommand = $sCmd;`
`596`	`596`	`} else {`
`597`	`597`	`$sMySQLBinDir = escapeshellcmd($sMySQLBinDir);`
`598`		`- $sMySQLCommand = '"'.$sMySQLBinDir.'/$sCmd"';`
	`598`	`+ $sMySQLCommand = $sMySQLBinDir.'/'.$sCmd;`
`599`	`599`	`if (!file_exists($sMySQLCommand)) {`
`600`	`600`	`throw new BackupException("$sCmd not found in $sMySQLBinDir");`
`601`	`601`	`}`
`602`	`602`	`}`
`603`	`603`
`604`		`- return $sMySQLCommand;`
	`604`	`+ return '"'.$sMySQLCommand.'"';`
`605`	`605`	`}`
`606`	`606`	`}`
`607`	`607`