From f6afcd0b82779be50f220ae728655039bbe1c65f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sat, 13 Oct 2007 00:05:45 +0000
Subject: [PATCH] =?UTF-8?q?Fix:=20A=20l'install=20on=20tente=20de=20suppri?=
 =?UTF-8?q?mer=20fichiers=20obsolete=20trigger=20doublon.=20Affiche=20mess?=
 =?UTF-8?q?age=20pour=20supression=20manuelle=20si=20=E9choue.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index e6cab99d204..6c060153921 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -1337,12 +1337,21 @@ function migrate_modeles($db,$langs,$conf)
  */
 function migrate_delete_old_files($db,$langs,$conf)
 {
-    //print '<br>';
-    //print '<b>'.$langs->trans('UpdateModelsTable')."</b><br>\n";
-	if (file_exists(DOL_DOCUMENT_ROOT.'/includes/triggers/interface_demo.class.php-NORUN'))
+    $result=true;
+	
+	$filetodelete=DOL_DOCUMENT_ROOT.'/includes/triggers/interface_demo.class.php';
+	//print '<b>'.$filetodelete."</b><br>\n";
+	if (file_exists($filetodelete))
 	{
-		@dol_delete_file(DOL_DOCUMENT_ROOT.'/includes/triggers/interface_demo.class.php');
+		$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>';
+	}
+	return $result;
 }
 
 ?>