friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #8790 from MrPetovan/bug/notices 

Fix latest notice messages
This commit is contained in:
Tobias Diekershoff 2020-06-20 18:07:54 +02:00 committed by GitHub
parent 03b9a993f9 a83681e93a
commit 797eff853a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Model/Item.php
View File

@ -3490,9 +3490,7 @@ class Item
*/ */
public static function getPlink($item) public static function getPlink($item)
{ {
$a = DI::app(); if (local_user()) {
if ($a->user['nickname'] != "") {
$ret = [ $ret = [
'href' => "display/" . $item['guid'], 'href' => "display/" . $item['guid'],
'orig' => "display/" . $item['guid'], 'orig' => "display/" . $item['guid'],
@ -3504,7 +3502,6 @@ class Item
$ret["href"] = DI::baseUrl()->remove($item['plink']); $ret["href"] = DI::baseUrl()->remove($item['plink']);
$ret["title"] = DI::l10n()->t('link to source'); $ret["title"] = DI::l10n()->t('link to source');
} }
} elseif (!empty($item['plink']) && ($item['private'] != self::PRIVATE)) { } elseif (!empty($item['plink']) && ($item['private'] != self::PRIVATE)) {
$ret = [ $ret = [
'href' => $item['plink'], 'href' => $item['plink'],

7
src/Protocol/OStatus.php
View File

@ -2087,10 +2087,9 @@ class OStatus
$mentioned = $newmentions; $mentioned = $newmentions;
foreach ($mentioned as $mention) { foreach ($mentioned as $mention) {
$condition = ['uid' => $owner['uid'], 'nurl' => Strings::normaliseLink($mention)]; $contact = Contact::getDetailsByURL($mention, $owner['uid']);
$contact = DBA::selectFirst('contact', ['forum', 'prv', 'self', 'contact-type'], $condition); if (!empty($contact) && ($contact["forum"] || $contact["prv"] || ($owner['contact-type'] == Contact::TYPE_COMMUNITY) ||
if ($contact["forum"] || $contact["prv"] || ($owner['contact-type'] == Contact::TYPE_COMMUNITY) || ($contact['self'] && ($owner['account-type'] == User::ACCOUNT_TYPE_COMMUNITY)))) {
($contact['self'] && ($owner['account-type'] == User::ACCOUNT_TYPE_COMMUNITY))) {
XML::addElement($doc, $entry, "link", "", XML::addElement($doc, $entry, "link", "",
[ [
"rel" => "mentioned", "rel" => "mentioned",