From e987e6e09369b83ed70993c48c522c60ea34af9e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 8 Dec 2020 22:16:38 +0100 Subject: [PATCH] Context for hook showSocinfoOnPrint has been moved from "showsocinfoonprint" to "main" --- ChangeLog | 2 +- htdocs/main.inc.php | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 782528daae8..af36d13e56a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -246,7 +246,7 @@ Following changes may create regressions for some external modules, but were nec * The method select_thirdparty(), deprecated since 3.8, into html.form.class.php has been removed. * Depreciate all methods with name ->valide(). Use instead methods ->validate(). * Function showStripePaymentUrl, getStripePaymentUrl, showPaypalPaymentUrl and getPaypalPaymentUrl has been removed. The generic one showOnlinePaymentUrl and getOnlinePaymentUrl are always used. - +* Context for hook showSocinfoOnPrint has been moved from "showsocinfoonprint" to "main" ***** ChangeLog for 12.0.3 compared to 12.0.2 ***** FIX: 10.0 - when the mime file name is different from the filesystem name, the attachment name should be the mime filename diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 81f560d662c..18c49b76881 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -1591,7 +1591,7 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead $searchform = ''; $bookmarks = ''; - // Instantiate hooks of thirdparty module + // Instantiate hooks for external modules $hookmanager->initHooks(array('toprightmenu')); $toprightmenu = ''; @@ -2429,7 +2429,7 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_ if (empty($conf->dol_hide_leftmenu) && (!defined('NOREQUIREMENU') || !constant('NOREQUIREMENU'))) { - // Instantiate hooks of thirdparty module + // Instantiate hooks for external modules $hookmanager->initHooks(array('searchform', 'leftblock')); print "\n".''."\n".'
'."\n"; @@ -2617,11 +2617,11 @@ function main_area($title = '') if (!empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED)) print info_admin($langs->trans("WarningYouAreInMaintenanceMode", $conf->global->MAIN_ONLY_LOGIN_ALLOWED), 0, 0, 1, 'warning maintenancemode'); - // Permit to add user company information on each printed document by set SHOW_SOCINFO_ON_PRINT + // Permit to add user company information on each printed document by setting SHOW_SOCINFO_ON_PRINT if (!empty($conf->global->SHOW_SOCINFO_ON_PRINT) && GETPOST('optioncss', 'aZ09') == 'print' && empty(GETPOST('disable_show_socinfo_on_print', 'az09'))) { global $hookmanager; - $hookmanager->initHooks(array('showsocinfoonprint')); + $hookmanager->initHooks(array('main')); $parameters = array(); $reshook = $hookmanager->executeHooks('showSocinfoOnPrint', $parameters); if (empty($reshook))