From af6e976a6e72079ff4c35ba83cd3db1e818805cc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 15 Sep 2010 17:20:20 +0000
Subject: [PATCH] Fix: Too many problems with triggers outside of standard dir.
 Only external module triggers must be in module dir.

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

diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 3da68cae195..5db6ad06d3e 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -3084,8 +3084,8 @@ function migrate_delete_old_files($db,$langs,$conf)
     DOL_DOCUMENT_ROOT.'/includes/menus/barre_top/default.php',
     DOL_DOCUMENT_ROOT.'/includes/modules/modComptabiliteExpert.class.php',
     DOL_DOCUMENT_ROOT.'/includes/modules/modProduit.class.php',
-    DOL_DOCUMENT_ROOT.'/includes/phenix/inc/triggers/interface_modPhenix_Phenixsynchro.class.php',
-    DOL_DOCUMENT_ROOT.'/includes/webcal/inc/triggers/interface_modWebcalendar_webcalsynchro.class.php',
+    DOL_DOCUMENT_ROOT.'/phenix/inc/triggers/interface_modPhenix_Phenixsynchro.class.php',
+    DOL_DOCUMENT_ROOT.'/webcalendar/inc/triggers/interface_modWebcalendar_webcalsynchro.class.php',
     DOL_DOCUMENT_ROOT.'/includes/triggers/interface_modCommande_Ecotax.class.php',
     DOL_DOCUMENT_ROOT.'/includes/triggers/interface_modCommande_fraisport.class.php',
     );
@@ -3103,6 +3103,10 @@ function migrate_delete_old_files($db,$langs,$conf)
                 print '<div class="error">'.$langs->trans("Error").': '.$langs->trans("ErrorFailToDeleteFile",$filetodelete);
                 print ' '.$langs->trans("RemoveItManuallyAndPressF5ToContinue").'</div>';
             }
+            else
+            {
+                //print $langs->trans("FileWasRemoved",$filetodelete);
+            }
         }
     }
     return $result;