extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix unwanted extra participants in consolidated views when new event participant preference is 'just me' - month view

Browse Source
This commit is contained in:
nathangray 2016-09-13 10:10:36 -06:00
parent 950c536d37
commit 87c9d72db9
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -92,6 +92,10 @@ class calendar_uiforms extends calendar_ui
if (isset($_GET['owner'])) if (isset($_GET['owner']))
{ {
$owner = $_GET['owner']; $owner = $_GET['owner'];
if(!is_array($owner) && strpos($owner, ','))
{
$owner = explode(',',$owner);
}
if(is_array($owner)) if(is_array($owner))
{ {
if($this->cal_prefs['default_participant']) if($this->cal_prefs['default_participant'])
@ -109,6 +113,7 @@ class calendar_uiforms extends calendar_ui
{ {
$owner = !$this->cal_prefs['default_participant'] ? $this->user : $this->owner; $owner = !$this->cal_prefs['default_participant'] ? $this->user : $this->owner;
} }
error_log(__METHOD__ . ' owner: ' . array2string($owner));
if (!$owner || !is_numeric($owner) || $GLOBALS['egw']->accounts->get_type($owner) != 'u' || if (!$owner || !is_numeric($owner) || $GLOBALS['egw']->accounts->get_type($owner) != 'u' ||
!$this->bo->check_perms(Acl::ADD,0,$owner)) !$this->bo->check_perms(Acl::ADD,0,$owner))