extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-13 17:38:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Prevent recur data from being copied to different days.

Browse Source
This commit is contained in:
Nathan Gray 2011-03-14 23:25:51 +00:00
parent da16cd319c
commit 1e9f96e9a7
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -152,6 +152,11 @@ class calendar_merge extends bo_merge
if (substr($name,-4) == 'date') $name = substr($name,0,-4); if (substr($name,-4) == 'date') $name = substr($name,0,-4);
$replacements['$$' . ($prefix ? $prefix . '/' : '') . 'calendar_'.$name . '$$'] = is_array($data['data']) ? implode(', ',$data['data']) : $data['data']; $replacements['$$' . ($prefix ? $prefix . '/' : '') . 'calendar_'.$name . '$$'] = is_array($data['data']) ? implode(', ',$data['data']) : $data['data'];
} }
if(!$replacements['$$'.($prefix ? $prefix . '/' : '') . 'calendar_recur_type$$'])
{
// Need to set it to '' if not set or previous record may be used
$replacements['$$'.($prefix ? $prefix . '/' : '') . 'calendar_recur_type$$'] = '';
}
foreach(array('start','end') as $what) foreach(array('start','end') as $what)
{ {
foreach(array( foreach(array(
@ -173,7 +178,6 @@ class calendar_merge extends bo_merge
{ {
$replacements['$$'.($prefix?$prefix.'/':'').'#'.$name.'$$'] = $event['#'.$name]; $replacements['$$'.($prefix?$prefix.'/':'').'#'.$name.'$$'] = $event['#'.$name];
} }
return $replacements; return $replacements;
} }