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

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

diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 89cd9a38260..f54856e8a23 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -3070,15 +3070,16 @@ function migrate_delete_old_files($db,$langs,$conf)
     foreach ($filetodeletearray as $filetodelete)
     {
         //print '<b>'.$filetodelete."</b><br>\n";
-        if (file_exists($filetodelete))
+        $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;