From 66e33b00d295baf44834352169cb226ecb1c37bd Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 15 Oct 2014 19:08:44 +0000
Subject: [PATCH] * Calendar: make custom fields available in table plugins for
 document merge

---
 calendar/inc/class.calendar_merge.inc.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/calendar/inc/class.calendar_merge.inc.php b/calendar/inc/class.calendar_merge.inc.php
index c2832163a7..b6eb870480 100644
--- a/calendar/inc/class.calendar_merge.inc.php
+++ b/calendar/inc/class.calendar_merge.inc.php
@@ -6,7 +6,7 @@
  * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
  * @author Nathan Gray
  * @package calendar
- * @copyright (c) 2007-9 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @copyright (c) 2007-14 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
  * @copyright 2011 Nathan Gray
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  * @version $Id$
@@ -271,7 +271,8 @@ class calendar_merge extends bo_merge
 			'offset' => 0,
 			'num_rows' => 20,
 			'order' => 'cal_start',
-			'daywise' => true
+			'daywise' => true,
+			'cfs' => array(),	// read all custom-fields
 		));
 
 		$days = array();
@@ -370,7 +371,8 @@ class calendar_merge extends bo_merge
 			'offset' => 0,
 			'num_rows' => 20,
 			'order' => 'cal_start',
-			'daywise' => true
+			'daywise' => true,
+			'cfs' => array(),	// read all custom-fields
 		));
 
 		$replacements = array();