From b317ea0ce1979f10ee24556c85b7445c22e0f834 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 15 Sep 2010 16:07:03 +0000 Subject: [PATCH] Fix: Too many problems with triggers outside of standard dir. Only external module triggers must be in module dir. --- .../triggers/interface_modPhenix_Phenixsynchro.class.php | 2 +- .../triggers/interface_modWebcalendar_Webcalsynchro.class.php | 2 +- htdocs/install/upgrade2.php | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) rename htdocs/{phenix/inc => includes}/triggers/interface_modPhenix_Phenixsynchro.class.php (99%) rename htdocs/{webcalendar/inc => includes}/triggers/interface_modWebcalendar_Webcalsynchro.class.php (99%) diff --git a/htdocs/phenix/inc/triggers/interface_modPhenix_Phenixsynchro.class.php b/htdocs/includes/triggers/interface_modPhenix_Phenixsynchro.class.php similarity index 99% rename from htdocs/phenix/inc/triggers/interface_modPhenix_Phenixsynchro.class.php rename to htdocs/includes/triggers/interface_modPhenix_Phenixsynchro.class.php index 6318198b7f5..d7ee4878fcb 100644 --- a/htdocs/phenix/inc/triggers/interface_modPhenix_Phenixsynchro.class.php +++ b/htdocs/includes/triggers/interface_modPhenix_Phenixsynchro.class.php @@ -18,7 +18,7 @@ */ /** - \file htdocs/phenix/inc/triggers/interface_modPhenix_Phenixsynchro.class.php + \file htdocs/includes/triggers/interface_modPhenix_Phenixsynchro.class.php \ingroup phenix \brief Fichier de gestion des triggers phenix \version $Id$ diff --git a/htdocs/webcalendar/inc/triggers/interface_modWebcalendar_Webcalsynchro.class.php b/htdocs/includes/triggers/interface_modWebcalendar_Webcalsynchro.class.php similarity index 99% rename from htdocs/webcalendar/inc/triggers/interface_modWebcalendar_Webcalsynchro.class.php rename to htdocs/includes/triggers/interface_modWebcalendar_Webcalsynchro.class.php index dc2b9feb78f..cd4f955ebd4 100644 --- a/htdocs/webcalendar/inc/triggers/interface_modWebcalendar_Webcalsynchro.class.php +++ b/htdocs/includes/triggers/interface_modWebcalendar_Webcalsynchro.class.php @@ -17,7 +17,7 @@ */ /** - \file htdocs/webcalendar/inc/triggers/interface_modWebcalendar_webcalsynchro.class.php + \file htdocs/includes/triggers/interface_modWebcalendar_webcalsynchro.class.php \ingroup webcalendar \brief Fichier de gestion des triggers webcalendar \version $Id$ diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php index 0f3c3e0b996..03933d36f81 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/triggers/interface_modPhenix_Phenixsynchro.class.php', - DOL_DOCUMENT_ROOT.'/includes/triggers/interface_modWebcalendar_webcalsynchro.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.'/includes/triggers/interface_modCommande_Ecotax.class.php', );