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

Merge pull request #3096 from GPCsolutions/replaceaddress

Browse Source 
Allow replacing the address block
This commit is contained in:
Juanjo Menent 2015-06-25 20:45:26 +02:00
commit ba984254a5
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
htdocs/core/class/hookmanager.class.php
View File

@ -130,24 +130,25 @@ class HookManager
// Define type of hook ('output' or 'addreplace'. 'returnvalue' is deprecated).
$hooktype='output';
if (in_array(
$method,
array(
'addMoreActionsButtons',
'addStatisticLine',
'deleteFile',
'doActions',
'formCreateThirdpartyOptions',
'formObjectOptions',
'formattachOptions',
'formBuilddocLineOptions',
'moveUploadedFile',
'pdf_writelinedesc',
'paymentsupplierinvoices',
'printSearchForm',
'formatEvent'
)
)) $hooktype='addreplace';
if (in_array(
$method,
array(
'addMoreActionsButtons',
'addStatisticLine',
'deleteFile',
'doActions',
'formCreateThirdpartyOptions',
'formObjectOptions',
'formattachOptions',
'formBuilddocLineOptions',
'moveUploadedFile',
'pdf_writelinedesc',
'paymentsupplierinvoices',
'printAddress',
'printSearchForm',
'formatEvent'
)
)) $hooktype='addreplace';
// Deprecated hook types ('returnvalue')
if (preg_match('/^pdf_/',$method) && $method != 'pdf_writelinedesc') $hooktype='returnvalue'; // pdf_xxx except pdf_writelinedesc are 'returnvalue' hooks. When there is 2 hooks of this type, only last one win. TODO Move them into 'output' or 'addreplace' hooks.
if ($method == 'insertExtraFields')