From: Michael Date: Sun, 1 Jan 2017 23:35:34 +0000 (+0000) Subject: Deactivated the auto mention - we should do it differently. X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=212f78386dd8760a7e750c4dfed2b75f278d1324;p=friendica.git Deactivated the auto mention - we should do it differently. --- diff --git a/mod/item.php b/mod/item.php index 7101440ef8..31d1a4acac 100644 --- a/mod/item.php +++ b/mod/item.php @@ -560,14 +560,8 @@ function item_post(&$a) { * add a statusnet style reply tag if the original post was from there * and we are replying, and there isn't one already */ - if ($parent AND (($parent_contact['network'] == NETWORK_OSTATUS) OR - (($parent_item['uri'] != $thr_parent) AND ($thr_parent_item['network'] == NETWORK_DIASPORA)))) { - - if ($thr_parent_item['network'] != NETWORK_DIASPORA) { - $contact = '@[url='.$parent_contact['url'].']'.$parent_contact['nick'].'[/url]'; - } else { - $contact = '@[url='.$parent_contact['url'].']'.$parent_contact['name'].'[/url]'; - } + if ($parent AND ($parent_contact['network'] == NETWORK_OSTATUS)) { + $contact = '@[url='.$parent_contact['url'].']'.$parent_contact['nick'].'[/url]'; if (!in_array($contact,$tags)) { $body = $contact.' '.$body;