From 49acbabce2a59eea9bb256b23ae022eaf974e323 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Wed, 6 Apr 2011 23:18:08 +0000
Subject: [PATCH] Add calendar ID to merge tags

---
 calendar/inc/class.calendar_merge.inc.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/calendar/inc/class.calendar_merge.inc.php b/calendar/inc/class.calendar_merge.inc.php
index b6ea5a1d51..c559ab95ff 100644
--- a/calendar/inc/class.calendar_merge.inc.php
+++ b/calendar/inc/class.calendar_merge.inc.php
@@ -147,6 +147,7 @@ class calendar_merge extends bo_merge
 		} else {
 			$event = $id;
 		}
+		$replacements['$$' . ($prefix ? $prefix . '/' : '') . 'calendar_id'. '$$'] = $event['id'];
 		foreach($this->bo->event2array($event) as $name => $data)
 		{
 			if (substr($name,-4) == 'date') $name = substr($name,0,-4);
@@ -435,6 +436,7 @@ class calendar_merge extends bo_merge
 		echo '<tr><td colspan="4"><h3>'.lang('Calendar fields:')."</h3></td></tr>";
 
 		foreach(array(
+			'calendar_id' => lang('Calendar ID'),
 			'calendar_title' => lang('Title'),
 			'calendar_description' => lang('Description'),
 			'calendar_participants' => lang('Participants'),