Merge pull request #5967 from annando/ap-nick

[friendica.git] / mod / item.php

diff --git a/mod/item.php b/mod/item.php
index dc93a9f798aef0d560c8e1b6953528c2c0882f43..5d4a23caa7a28802a4c9f82210c07c5f640e9aa7 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -1012,11 +1012,7 @@ function handle_tag(App $a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $n
 
                        $profile = $contact["url"];
                        $alias   = $contact["alias"];
-                       $newname = $contact["nick"];
-
-                       if (($newname == "") || !in_array($contact["network"], [Protocol::ACTIVITYPUB, Protocol::OSTATUS, Protocol::TWITTER, Protocol::STATUSNET])) {
-                               $newname = $contact["name"];
-                       }
+                       $newname = defaults($contact, "name", $contact["nick"]);
                }
 
                //if there is an url for this persons profile