fix testing MySQLBinDir

favincen · favincen · commit fbee01f16d23 · 2025-10-30T00:02:51.000+01:00
diff --git a/setup/backup.class.inc.php b/setup/backup.class.inc.php
@@ -635,13 +635,13 @@ public static function MakeSafeMySQLCommand($sMySQLBinDir, string $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
`@@ -635,13 +635,13 @@ public static function MakeSafeMySQLCommand($sMySQLBinDir, string $sCmd)`
`635`	`635`	`}`
`636`	`636`	`else {`
`637`	`637`	`$sMySQLBinDir = escapeshellcmd($sMySQLBinDir);`
`638`		`- $sMySQLCommand = '"'.$sMySQLBinDir.'/$sCmd"';`
	`638`	`+ $sMySQLCommand = $sMySQLBinDir.'/'.$sCmd;`
`639`	`639`	`if (!file_exists($sMySQLCommand)) {`
`640`	`640`	`throw new BackupException("$sCmd not found in $sMySQLBinDir");`
`641`	`641`	`}`
`642`	`642`	`}`
`643`	`643`
`644`		`- return $sMySQLCommand;`
	`644`	`+ return '"'.$sMySQLCommand.'"';`
`645`	`645`	`}`
`646`	`646`	`}`
`647`	`647`