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

Adapt calendar participants to et2 link

Browse Source
This commit is contained in:
Nathan Gray 2013-02-08 14:07:39 +00:00
parent a99deb4473
commit f61d4b64f5
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
calendar/inc/class.calendar_uiforms.inc.php
View File

@ -313,6 +313,11 @@ class calendar_uiforms extends calendar_ui
if (is_array($data)) // if $data['current'] is NOT set --> $app==''
{
list($app,$id) = explode(':',$data['current']);
if(!$app && !$id)
{
$app = $data['app'];
$id = $data['id'];
}
}
else
{
@ -1871,7 +1876,7 @@ function replace_eTemplate_onsubmit()
);
$GLOBALS['egw_info']['flags']['app_header'] = lang('calendar') . ' - ' . lang('Scheduling conflict');
$etpl->exec('calendar.calendar_uiforms.process_edit',$content,false,false,array_merge($event,$preserv),$preserv['no_popup'] ? 0 : 2);
$etpl->exec('calendar.calendar_uiforms.process_edit',$content,array(),array(),array_merge($event,$preserv),$preserv['no_popup'] ? 0 : 2);
}
/**