From 38ccf7ffdd74ae5d36f3a3ff20702a97f8c79119 Mon Sep 17 00:00:00 2001
From: hugome <hugomeyronneinc@gmail.com>
Date: Thu, 2 Mar 2017 20:16:12 +0100
Subject: [PATCH] Fix : Agenda getCalendarEvents hook
Return of getCalendarEvents on agenda page :
The array_merge change key of merged array.
---
htdocs/comm/action/index.php | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 5366720bfc6..321d15ba485 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -919,7 +919,14 @@ if (count($listofextcals))
// Complete $eventarray with events coming from external module
$parameters=array(); $object=null;
$reshook=$hookmanager->executeHooks('getCalendarEvents',$parameters,$object,$action);
-if (! empty($hookmanager->resArray['eventarray'])) $eventarray=array_merge($eventarray, $hookmanager->resArray['eventarray']);
+if (! empty($hookmanager->resArray['eventarray'])) {
+ foreach ($hookmanager->resArray['eventarray'] as $keyDate => $events) {
+ if (!isset($eventarray[$keyDate])) {
+ $eventarray[$keyDate]=array();
+ }
+ $eventarray[$keyDate]=array_merge($eventarray[$keyDate], $events);
+ }
+}
--
GitLab