holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Calendar: make custom fields available in table plugins for document merge

Browse Source
This commit is contained in:
Ralf Becker 2014-10-15 19:08:26 +00:00
parent 5082d8a634
commit 3759e498d9
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
calendar/inc/class.calendar_merge.inc.php
View File

@ -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();