lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Remove warning

Browse Source
This commit is contained in:
Laurent Destailleur 2009-11-25 13:29:28 +00:00
parent 72cf30350a
commit 1c618d7100
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/admin/tools/export.php
View File

@ -195,7 +195,7 @@ if ($what == 'mysql')
{ {
// Renommer fichier sortie en fichier erreur // Renommer fichier sortie en fichier erreur
//print "$outputfile -> $outputerror"; //print "$outputfile -> $outputerror";
dol_delete_file($outputerror); dol_delete_file($outputerror,1);
@rename($outputfile,$outputerror); @rename($outputfile,$outputerror);
// Si safe_mode on et command hors du parametre exec, on a un fichier out vide donc errormsg vide // 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"); if (! $errormsg) $errormsg=$langs->trans("ErrorFailedToRunExternalCommand");

3
htdocs/lib/functions.lib.php
View File

@ -2198,11 +2198,12 @@ function print_fleche_navigation($page,$file,$options='',$nextpage,$betweenarrow
/** /**
* \brief Remove a file or several files with a mask * \brief Remove a file or several files with a mask
* \param file File to delete or mask of file to delete * \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 * \param boolean True if file deleted, False if error
*/ */
function dol_delete_file($file,$disableglob=0) function dol_delete_file($file,$disableglob=0)
{ {
//print "x".$file." ".$disableglob;
$ok=true; $ok=true;
$newfile=utf8_check($file)?utf8_decode($file):$file; // glob function accepts only ISO string $newfile=utf8_check($file)?utf8_decode($file):$file; // glob function accepts only ISO string
if (empty($disableglob)) if (empty($disableglob))