extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-16 13:03:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

- Fix $$Recurrence$$ notification placeholder to be empty (not missing) for non-recurring events

Browse Source 
- Avoid warning in get_link_options by making unused parameter optional
This commit is contained in:
Nathan Gray 2015-03-23 20:00:10 +00:00
parent 8989730c56
commit 579b202001
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
calendar/inc/class.calendar_bo.inc.php
View File

@ -1834,7 +1834,7 @@ class calendar_bo
* @param type $event * @param type $event
* @return array array of selected calendar fields * @return array array of selected calendar fields
*/ */
function get_link_options ($event) function get_link_options ($event = array())
{ {
$options = array ( $options = array (
'end' => lang('End date'), 'end' => lang('End date'),

11
calendar/inc/class.calendar_boupdate.inc.php
View File

@ -1775,13 +1775,10 @@ class calendar_boupdate extends calendar_bo
); );
// Repeated Events // Repeated Events
if($event['recur_type'] != MCAL_RECUR_NONE) $var['recur_type'] = Array(
{ 'field' => lang('Repetition'),
$var['recur_type'] = Array( 'data' => ($event['recur_type'] != MCAL_RECUR_NONE) ? $this->recure2string($event) : '',
'field' => lang('Repetition'), );
'data' => $this->recure2string($event),
);
}
return $var; return $var;
} }