Calendar: Fix sidebox merge

calendar/inc/class.calendar_merge.inc.php

@@ -153,6 +153,11 @@ class calendar_merge extends Api\Storage\Merge
 			$ids = json_decode($_REQUEST['id'], true);
 		}
 
+		// Need an array, and to modify the original to add path in
+		if(!is_array($_REQUEST['document']))
+		{
+			$_REQUEST['document'] = [$_REQUEST['document']];
+		}
 		foreach($_REQUEST['document'] as &$document)
 		{
 			// Try to make time span into appropriate ranges to match

calendar/js/app.ts

@@ -2372,7 +2372,7 @@ export class CalendarApp extends EgwApp
 				menuaction: 'calendar.calendar_merge.merge_entries',
 				document: widget.getValue(),
 				merge: 'calendar_merge',
-				pdf: false,
+				options: {pdf: false},
 				select_all: false,
 				id: JSON.stringify({
 					first: app.calendar.state.first,