From e40d6440855888d6f945b6594874a3721a5160d8 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 4 Sep 2013 16:49:20 +0200 Subject: [PATCH] Fix: Remove warning --- htdocs/core/lib/files.lib.php | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php index fa95b75e9a6..3c831f5ffcb 100644 --- a/htdocs/core/lib/files.lib.php +++ b/htdocs/core/lib/files.lib.php @@ -742,13 +742,18 @@ function dol_delete_file($file,$disableglob=0,$nophperrors=0,$nohook=0,$object=n { $globencoded=str_replace('[','\[',$file_osencoded); $globencoded=str_replace(']','\]',$globencoded); - foreach (glob($globencoded) as $filename) + $listofdir=glob($globencoded); + if (! empty($listofdir) && is_array($listofdir)) { - if ($nophperrors) $ok=@unlink($filename); // The unlink encapsulated by dolibarr - else $ok=unlink($filename); // The unlink encapsulated by dolibarr - if ($ok) dol_syslog("Removed file ".$filename, LOG_DEBUG); - else dol_syslog("Failed to remove file ".$filename, LOG_WARNING); + foreach ($listofdir as $filename) + { + if ($nophperrors) $ok=@unlink($filename); // The unlink encapsulated by dolibarr + else $ok=unlink($filename); // The unlink encapsulated by dolibarr + if ($ok) dol_syslog("Removed file ".$filename, LOG_DEBUG); + else dol_syslog("Failed to remove file ".$filename, LOG_WARNING); + } } + else dol_syslog("No files to delete found", LOG_WARNING); } else {