From 9567a1fed3d110d95a269ef15930a70d0f951de1 Mon Sep 17 00:00:00 2001
From: Ralf Becker <RalfBecker@outdoor-training.de>
Date: Thu, 15 Oct 2020 11:35:53 +0200
Subject: [PATCH] fix contacts shared with a user are not visible in his
 personal AB, but when all addressbooks selected

---
 api/src/Contacts/Sql.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/api/src/Contacts/Sql.php b/api/src/Contacts/Sql.php
index 2a354a939a..e98add9810 100644
--- a/api/src/Contacts/Sql.php
+++ b/api/src/Contacts/Sql.php
@@ -505,8 +505,7 @@ class Sql extends Api\Storage
 			$this->db->expression(self::SHARED_TABLE, ['shared_with' => $filter['owner'] ?? array_keys($this->grants)]).')';
 
 		// add filter for read ACL in sql, if user is NOT the owner of the addressbook
-		if (isset($this->grants) && !$ignore_acl &&
-			!(isset($filter['owner']) && $filter['owner'] == $GLOBALS['egw_info']['user']['account_id']))
+		if (isset($this->grants) && !$ignore_acl)
 		{
 			// add read ACL for groupmembers (they have no
 			if ($GLOBALS['egw_info']['user']['preferences']['common']['account_selection'] == 'groupmembers' &&
@@ -549,6 +548,12 @@ class Sql extends Api\Storage
 						" OR contact_private=0 AND $this->table_name.contact_owner IN (".
 						implode(',',array_keys($this->grants)).") $groupmember_sql OR $this->table_name.contact_owner IS NULL)";
 				}
+				else
+				{
+					$filter[] = '('.$this->db->expression($this->table_name, $this->table_name.'.', ['contact_owner' => $filter['owner']]).
+						" OR $shared_sql)";
+					unset($filter['owner']);
+				}
 			}
 			else	// search all addressbooks, incl. accounts
 			{