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

quiten warning if $this->user is not set eg. in import but $ignore_acl

Browse Source
This commit is contained in:
Ralf Becker 2016-10-03 11:46:42 +02:00
parent 6590fea6be
commit 0c8d2ea9e6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
infolog/inc/class.infolog_bo.inc.php
View File

@ -732,7 +732,7 @@ class infolog_bo
$old = $this->read($values['info_id'], false, 'server', $ignore_acl);
}
if (($status_only = $values['info_id'] && !$this->check_access($values,Acl::EDIT)))
if (($status_only = !$ignore_acl && $values['info_id'] && !$this->check_access($values,Acl::EDIT)))
{
if (!isset($values['info_responsible']))
{
@ -742,7 +742,7 @@ class infolog_bo
{
$responsible = $values['info_responsible'];
}
if (!($status_only = $this->user && in_array($this->user, (array)$responsible))) // responsible has implicit right to change status
if (!($status_only = in_array($this->user, (array)$responsible))) // responsible has implicit right to change status
{
$status_only = !!array_intersect((array)$responsible,array_keys($GLOBALS['egw']->accounts->memberships($this->user)));
}