Merge branch '15.0' of [email protected]:Dolibarr/dolibarr.git into 16.0

atm-maxime · Oct 29, 2024 · 6a4ee18 · 6a4ee18
2 parents fa22ebd + b3a2908
commit 6a4ee18
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/htdocs/core/class/utils.class.php b/htdocs/core/class/utils.class.php
@@ -511,7 +511,7 @@ public function dumpDatabase($compression = 'none', $type = 'auto', $usedefault
 				} elseif ($compression == 'zstd') {
 					fclose($handle);
 				}
-				if ($ok && preg_match('/^-- (MySql|MariaDB)/i', $errormsg)) {	// No error
+				if ($ok && preg_match('/^-- (MySql|MariaDB)/i', $errormsg) || preg_match('/^\/\*M?!999999/', $errormsg)) {	// Start of file is ok, NOT an error
 					$errormsg = '';
 				} else {
 					// Renommer fichier sortie en fichier erreur