strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #7512 from annando/cid-forum

Browse source 
Use the contact id whenever we are following the contact
This commit is contained in:
Philipp 2019-08-13 18:50:10 +02:00 committed by GitHub
parent bf0e9e7d03 aab6b739d8
commit 23da053cf8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Model/Item.php
View file

@ -1243,6 +1243,8 @@ class Item extends BaseObject
{ {
if (!empty($item['contact-id']) && DBA::exists('contact', ['self' => true, 'id' => $item['contact-id']])) { if (!empty($item['contact-id']) && DBA::exists('contact', ['self' => true, 'id' => $item['contact-id']])) {
return $item['contact-id']; return $item['contact-id'];
} elseif (($item['gravity'] == GRAVITY_PARENT) && !empty($item['uid']) && !empty($item['contact-id']) && Contact::isSharing($item['contact-id'], $item['uid'])) {
return $item['contact-id'];
} elseif (!empty($item['uid']) && !Contact::isSharing($item['author-id'], $item['uid'])) { } elseif (!empty($item['uid']) && !Contact::isSharing($item['author-id'], $item['uid'])) {
return $item['author-id']; return $item['author-id'];
} elseif (!empty($item['contact-id'])) { } elseif (!empty($item['contact-id'])) {