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

skip current user only for users, not group(-preferences)

Browse Source
This commit is contained in:
Ralf Becker 2014-07-23 13:16:24 +00:00
parent e7da57c6cb
commit f6bba15754
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1581,11 +1581,9 @@ END:VTIMEZONE
foreach (calendar_bo::list_calendars($hook_data['account_id']) as $entry) foreach (calendar_bo::list_calendars($hook_data['account_id']) as $entry)
{ {
$account_id = $entry['grantor']; $account_id = $entry['grantor'];
if ($account_id != $hook_data['account_id']) // skip current user $cals[$account_id] = $entry['name'];
{
$cals[$account_id] = $entry['name'];
}
} }
if ($hook_data['account_id'] > 0) unset($cals[$hook_data['account_id']]); // skip current user
} }
$cals['G'] = lang('Primary group'); $cals['G'] = lang('Primary group');
$cals['A'] = lang('All'); $cals['A'] = lang('All');

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

@ -1547,7 +1547,7 @@ class calendar_groupdav extends groupdav_handler
{ {
$calendars[$entry['grantor']] = $entry['name']; $calendars[$entry['grantor']] = $entry['name'];
} }
unset($calendars[$user]); if ($user > 0) unset($calendars[$user]); // skip current user
} }
$settings = array(); $settings = array();