From 1c618d7100c6d3dc5a306f43ff40ed413511d7ba Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 25 Nov 2009 13:29:28 +0000 Subject: [PATCH] Fix: Remove warning --- htdocs/admin/tools/export.php | 2 +- htdocs/lib/functions.lib.php | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/htdocs/admin/tools/export.php b/htdocs/admin/tools/export.php index 3faba263135..3aff53accf9 100644 --- a/htdocs/admin/tools/export.php +++ b/htdocs/admin/tools/export.php @@ -195,7 +195,7 @@ if ($what == 'mysql') { // Renommer fichier sortie en fichier erreur //print "$outputfile -> $outputerror"; - dol_delete_file($outputerror); + dol_delete_file($outputerror,1); @rename($outputfile,$outputerror); // Si safe_mode on et command hors du parametre exec, on a un fichier out vide donc errormsg vide if (! $errormsg) $errormsg=$langs->trans("ErrorFailedToRunExternalCommand"); diff --git a/htdocs/lib/functions.lib.php b/htdocs/lib/functions.lib.php index bd2b1e9e45d..4293cf10f56 100644 --- a/htdocs/lib/functions.lib.php +++ b/htdocs/lib/functions.lib.php @@ -2198,11 +2198,12 @@ function print_fleche_navigation($page,$file,$options='',$nextpage,$betweenarrow /** * \brief Remove a file or several files with a mask * \param file File to delete or mask of file to delete - * \param disableglob Disable usage of globa like * + * \param disableglob Disable usage of glob like * * \param boolean True if file deleted, False if error */ function dol_delete_file($file,$disableglob=0) { + //print "x".$file." ".$disableglob; $ok=true; $newfile=utf8_check($file)?utf8_decode($file):$file; // glob function accepts only ISO string if (empty($disableglob))