diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php index bec8bf2731c..96eb2558bc0 100755 --- a/htdocs/core/class/hookmanager.class.php +++ b/htdocs/core/class/hookmanager.class.php @@ -37,6 +37,9 @@ class HookManager // Array with instantiated classes var $hooks=array(); + + // Array result + var $resArray=array(); /** * Constructor @@ -168,7 +171,9 @@ class HookManager else if (method_exists($actioninstance,$method)) { 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; } } } diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php index c8889131eab..c022d3fda67 100644 --- a/htdocs/core/lib/pdf.lib.php +++ b/htdocs/core/lib/pdf.lib.php @@ -1651,9 +1651,9 @@ function pdf_getLinkedObjects($object,$outputlangs,$hookmanager=false) { $parameters = array('linkedobjects' => $linkedobjects, 'outputlangs'=>$outputlangs); $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; }