From 5b3a3b8e2e68a989a3d2a83a9803b64be1d82f78 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Fri, 2 Mar 2012 17:29:11 +0800
Subject: [PATCH] Fix: add array return

---
 htdocs/core/class/hookmanager.class.php | 7 ++++++-
 htdocs/core/lib/pdf.lib.php             | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

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;
 }