Merge pull request #8790 from MrPetovan/bug/notices
Fix latest notice messages
This commit is contained in:
commit
797eff853a
|
@ -3490,9 +3490,7 @@ class Item
|
|||
*/
|
||||
public static function getPlink($item)
|
||||
{
|
||||
$a = DI::app();
|
||||
|
||||
if ($a->user['nickname'] != "") {
|
||||
if (local_user()) {
|
||||
$ret = [
|
||||
'href' => "display/" . $item['guid'],
|
||||
'orig' => "display/" . $item['guid'],
|
||||
|
@ -3504,7 +3502,6 @@ class Item
|
|||
$ret["href"] = DI::baseUrl()->remove($item['plink']);
|
||||
$ret["title"] = DI::l10n()->t('link to source');
|
||||
}
|
||||
|
||||
} elseif (!empty($item['plink']) && ($item['private'] != self::PRIVATE)) {
|
||||
$ret = [
|
||||
'href' => $item['plink'],
|
||||
|
|
|
@ -2087,10 +2087,9 @@ class OStatus
|
|||
$mentioned = $newmentions;
|
||||
|
||||
foreach ($mentioned as $mention) {
|
||||
$condition = ['uid' => $owner['uid'], 'nurl' => Strings::normaliseLink($mention)];
|
||||
$contact = DBA::selectFirst('contact', ['forum', 'prv', 'self', 'contact-type'], $condition);
|
||||
if ($contact["forum"] || $contact["prv"] || ($owner['contact-type'] == Contact::TYPE_COMMUNITY) ||
|
||||
($contact['self'] && ($owner['account-type'] == User::ACCOUNT_TYPE_COMMUNITY))) {
|
||||
$contact = Contact::getDetailsByURL($mention, $owner['uid']);
|
||||
if (!empty($contact) && ($contact["forum"] || $contact["prv"] || ($owner['contact-type'] == Contact::TYPE_COMMUNITY) ||
|
||||
($contact['self'] && ($owner['account-type'] == User::ACCOUNT_TYPE_COMMUNITY)))) {
|
||||
XML::addElement($doc, $entry, "link", "",
|
||||
[
|
||||
"rel" => "mentioned",
|
||||
|
|
Loading…
Reference in New Issue
Block a user