From e6722ad64fa8b836f2f279f4e0e7a691bf4a17a4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 18 Aug 2010 20:26:57 +0000
Subject: [PATCH] Fix: Error management on delete file

---
 htdocs/install/upgrade2.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index b2daa22dd83..87d35c5a168 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -3073,15 +3073,16 @@ function migrate_delete_old_files($db,$langs,$conf)
     foreach ($filetodeletearray as $filetodelete)
     {
         //print '<b>'.$filetodelete."</b><br>\n";
+        $result=1;
         if (file_exists($filetodelete))
         {
             $result=dol_delete_file($filetodelete);
-        }
-        if (! $result)
-        {
-            $langs->load("errors");
-            print '<div class="error">'.$langs->trans("Error").': '.$langs->trans("ErrorFailToDeleteFile",$filetodelete);
-            print ' '.$langs->trans("RemoveItManuallyAndPressF5ToContinue").'</div>';
+            if (! $result)
+            {
+                $langs->load("errors");
+                print '<div class="error">'.$langs->trans("Error").': '.$langs->trans("ErrorFailToDeleteFile",$filetodelete);
+                print ' '.$langs->trans("RemoveItManuallyAndPressF5ToContinue").'</div>';
+            }
         }
     }
     return $result;