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 '
'; - //print ''.$langs->trans('UpdateModelsTable')."
\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 ''.$filetodelete."
\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 '
'.$langs->trans("Error").': '.$langs->trans("ErrorFailToDeleteFile",$filetodelete); + print ' '.$langs->trans("RemoveItManuallyAndPressF5ToContinue").'
'; + } + return $result; } ?>