From 418009ffea8f9eed127e568a6069ae00c4ee5685 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Fri, 2 Aug 2019 16:46:26 +0000
Subject: [PATCH] Improved PR 7452: We now respect the "self" contact

---
 src/Model/Item.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Model/Item.php b/src/Model/Item.php
index 248e646af..ef461fe65 100644
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -1234,7 +1234,9 @@ class Item extends BaseObject
 
 	private static function contactId($item)
 	{
-		if (!empty($item['uid']) && !Contact::isSharing($item['author-id'], $item['uid'])) {
+		if (!empty($item['contact-id']) && DBA::exists('contact', ['self' => true, 'id' => $item['contact-id']])) {
+			return $item['contact-id'];
+		} elseif (!empty($item['uid']) && !Contact::isSharing($item['author-id'], $item['uid'])) {
 			return $item['author-id'];
 		} elseif (!empty($item['contact-id'])) {
 			return $item['contact-id'];