From 36a2be6dd36b21942b81056d86a3c4fa474ed9e1 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 20 Jun 2011 18:21:29 +0000
Subject: [PATCH] Fix merge from list view

---
 calendar/inc/class.calendar_merge.inc.php  |  2 +-
 calendar/inc/class.calendar_uilist.inc.php | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/calendar/inc/class.calendar_merge.inc.php b/calendar/inc/class.calendar_merge.inc.php
index c559ab95ff..3e3d44ae54 100644
--- a/calendar/inc/class.calendar_merge.inc.php
+++ b/calendar/inc/class.calendar_merge.inc.php
@@ -398,7 +398,7 @@ class calendar_merge extends bo_merge
 				$replacements = $this->contact_replacements(substr($participant,1),'');
 				break;
 			case 'r':
-				if (is_null(self::$resources)) self::$resources = CreateObject('resources.bo_resources');
+				if (is_null(self::$resources)) self::$resources = CreateObject('resources.resources_bo');
 				if (($resource = self::$resources->read(substr($participant,1))))
 				{
 					foreach($resource as $name => $value)
diff --git a/calendar/inc/class.calendar_uilist.inc.php b/calendar/inc/class.calendar_uilist.inc.php
index c76ca73b8a..e487223db6 100644
--- a/calendar/inc/class.calendar_uilist.inc.php
+++ b/calendar/inc/class.calendar_uilist.inc.php
@@ -97,6 +97,13 @@ class calendar_uilist extends calendar_ui
 
 		$etpl = new etemplate('calendar.list');
 
+		// Handle merge from sidebox
+		if($_GET['merge'])
+		{
+			$content['nm']['action'] = 'document_'.$_GET['merge'];
+			$content['nm']['select_all'] = true;
+		}
+
 		if (is_array($content))
 		{
 			// handle a single button like actions
@@ -704,6 +711,9 @@ class calendar_uilist extends calendar_ui
 					$checked['start'] = $nm['startdate'];
 					$checked['end'] = $nm['enddate'];
 					break;
+				default:
+					$date = date_create_from_format('Ymd',$this->date);
+					$checked['start']= $date->format('U');
 			}
 		}
 		return $checked;
@@ -789,12 +799,10 @@ class calendar_uilist extends calendar_ui
 			'hint' => 'Download this event as iCal',
 			'disableClass' => 'rowNoView',
 		);
-/* not working, needs fixing
 		$actions['documents'] = addressbook_merge::document_action(
 			$this->bo->cal_prefs['document_dir'], ++$group, 'Insert in document', 'document_',
 			$this->bo->cal_prefs['default_document']
 		);
-*/
 		++$group;
 		$actions['delete'] = array(
 			'caption' => 'Delete',