From fd8d09c8c084a13ec6af0868670038573933d285 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 29 Mar 2015 17:53:05 +0200
Subject: [PATCH] Fix avoid warning
---
htdocs/admin/index.php | 1 +
htdocs/core/class/hookmanager.class.php | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/htdocs/admin/index.php b/htdocs/admin/index.php
index bbedab346d1..9e6d316c9ee 100644
--- a/htdocs/admin/index.php
+++ b/htdocs/admin/index.php
@@ -100,6 +100,7 @@ print '<br>';
print '<br>';
// Add hook to add information
+$parameters=array();
$reshook=$hookmanager->executeHooks('addHomeSetup',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks
print $hookmanager->resPrint;
if (empty($reshook))
diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index 906c1e6c4ae..6b50cc68cbd 100644
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -184,7 +184,7 @@ class HookManager
}*/
}
- if (is_array($actionclassinstance->results)) $this->resArray =array_merge($this->resArray, $actionclassinstance->results);
+ if (isset($actionclassinstance->results) && is_array($actionclassinstance->results)) $this->resArray =array_merge($this->resArray, $actionclassinstance->results);
if (! empty($actionclassinstance->resprints)) $this->resPrint.=$actionclassinstance->resprints;
}
// Generic hooks that return a string or array (printSearchForm, printLeftBlock, formAddObjectLine, formBuilddocOptions, ...)
--
GitLab