Merge pull request #6481 from Hugome/fix-agenda-merge

FIX : Agenda getCalendarEvents hook
Dolibarr · Mar 31, 2017 · b970596 · b970596
2 parents 290caba + 38ccf7f
commit b970596
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
@@ -919,7 +919,14 @@
 // 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);
+    }
+}