From 8030b395360fdc9006ef7a4eec8d4b13b6342a1c Mon Sep 17 00:00:00 2001
From: unknown <Philippe@grandoc.(none)>
Date: Fri, 19 Apr 2013 19:45:06 +0200
Subject: [PATCH] fix : undefined variable
---
htdocs/core/class/hookmanager.class.php | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index efd7ad6932d..8e585f7e34a 100755
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -138,8 +138,6 @@ class HookManager
{
foreach($modules as $module => $actionclassinstance)
{
- //var_dump(get_class($actionclassinstance).'->'.$method);
-
// jump to next class if method does not exists
if (! method_exists($actionclassinstance,$method)) continue;
// test to avoid to run twice a hook, when a module implements several active contexts
@@ -164,13 +162,13 @@ class HookManager
}
// Generic hooks that return a string (printSearchForm, printLeftBlock, printTopRightMenu, formAddObjectLine, formBuilddocOptions, ...)
else
- {
+ {
// TODO. this should be done into the method by returning nothing
if (is_array($parameters) && ! empty($parameters['special_code']) && $parameters['special_code'] > 3 && $parameters['special_code'] != $actionclassinstance->module_number) continue;
$result = $actionclassinstance->$method($parameters, $object, $action, $this);
- if (is_array($actionclassinstance->results)) $this->resArray =array_merge($this->resArray, $actionclassinstance->results);
+ if (! empty($actionclassinstance->results) && is_array($actionclassinstance->results)) $this->resArray =array_merge($this->resArray, $actionclassinstance->results);
if (! empty($actionclassinstance->resprints)) $this->resPrint.=$actionclassinstance->resprints;
// TODO. remove this. array result must be set into $actionclassinstance->results
@@ -179,7 +177,7 @@ class HookManager
if (! is_array($result) && ! is_numeric($result)) $this->resPrint.=$result;
}
- //print "method=".$method." results=".count($actionclassinstance->results)." resprints=".count($actionclassinstance->resprints)." result=".$result." resaction=".$resaction;
+ //print "method=".$method." results=".count($actionclassinstance->results)." resprints=".count($actionclassinstance->resprints)." result=".$result." resaction=".$resaction;
}
}
}
--
GitLab