lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Context for hook showSocinfoOnPrint has been moved from

Browse Source 
"showsocinfoonprint" to "main"
This commit is contained in:
Laurent Destailleur 2020-12-08 22:16:38 +01:00
parent 70b772cf74
commit e987e6e093
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -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. * 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(). * 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. * 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 ***** ***** 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 FIX: 10.0 - when the mime file name is different from the filesystem name, the attachment name should be the mime filename

8
htdocs/main.inc.php
View File

@ -1591,7 +1591,7 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
$searchform = ''; $searchform = '';
$bookmarks = ''; $bookmarks = '';
// Instantiate hooks of thirdparty module // Instantiate hooks for external modules
$hookmanager->initHooks(array('toprightmenu')); $hookmanager->initHooks(array('toprightmenu'));
$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'))) 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')); $hookmanager->initHooks(array('searchform', 'leftblock'));
print "\n".'<!-- Begin side-nav id-left -->'."\n".'<div class="side-nav"><div id="id-left">'."\n"; print "\n".'<!-- Begin side-nav id-left -->'."\n".'<div class="side-nav"><div id="id-left">'."\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'); 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'))) if (!empty($conf->global->SHOW_SOCINFO_ON_PRINT) && GETPOST('optioncss', 'aZ09') == 'print' && empty(GETPOST('disable_show_socinfo_on_print', 'az09')))
{ {
global $hookmanager; global $hookmanager;
$hookmanager->initHooks(array('showsocinfoonprint')); $hookmanager->initHooks(array('main'));
$parameters = array(); $parameters = array();
$reshook = $hookmanager->executeHooks('showSocinfoOnPrint', $parameters); $reshook = $hookmanager->executeHooks('showSocinfoOnPrint', $parameters);
if (empty($reshook)) if (empty($reshook))