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

Fix: add array return

Browse Source
This commit is contained in:
Regis Houssin 2012-03-02 17:29:11 +08:00
parent 61e90e0d9d
commit 5b3a3b8e2e
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,6 +38,9 @@ class HookManager
// Array with instantiated classes // Array with instantiated classes
var $hooks=array(); var $hooks=array();
// Array result
var $resArray=array();
/** /**
* Constructor * Constructor
* *
@ -168,7 +171,9 @@ class HookManager
else if (method_exists($actioninstance,$method)) else if (method_exists($actioninstance,$method))
{ {
if (is_array($parameters) && $parameters['special_code'] > 3 && $parameters['special_code'] != $actioninstance->module_number) continue; if (is_array($parameters) && $parameters['special_code'] > 3 && $parameters['special_code'] != $actioninstance->module_number) continue;
$resprint.=$actioninstance->$method($parameters, $object, $action, $this); $result = $actioninstance->$method($parameters, $object, $action, $this);
if (is_array($result)) $this->resArray = array_merge($this->resArray, $result);
else $resprint.=$result;
} }
} }
} }

2
htdocs/core/lib/pdf.lib.php
View File

@ -1651,7 +1651,7 @@ function pdf_getLinkedObjects($object,$outputlangs,$hookmanager=false)
{ {
$parameters = array('linkedobjects' => $linkedobjects, 'outputlangs'=>$outputlangs); $parameters = array('linkedobjects' => $linkedobjects, 'outputlangs'=>$outputlangs);
$action=''; $action='';
$linkedobjects = $hookmanager->executeHooks('pdf_getLinkedObjects',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks $hookmanager->executeHooks('pdf_getLinkedObjects',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks
} }
return $linkedobjects; return $linkedobjects;