From 0c8d2ea9e65ea72d41a91c8a3e0ec3691292fec9 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Mon, 3 Oct 2016 11:46:42 +0200 Subject: [PATCH] quiten warning if $this->user is not set eg. in import but $ignore_acl --- infolog/inc/class.infolog_bo.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/infolog/inc/class.infolog_bo.inc.php b/infolog/inc/class.infolog_bo.inc.php index 0dbd75dac1..2e8df94d2e 100644 --- a/infolog/inc/class.infolog_bo.inc.php +++ b/infolog/inc/class.infolog_bo.inc.php @@ -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))); }