Ostatus: The automatical adding of @-replies now uses the correct contact.

diff --git a/mod/item.php b/mod/item.php
index ec6f81f6bf92fe2de1ac269f5dcb3941ca6c107a..aecfc1bb8c4459372726224129527b00c88a2559 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -570,9 +570,9 @@ function item_post(&$a) {
         */
 
        if(($parent_contact) && ($parent_contact['network'] === NETWORK_OSTATUS)
-               && ($parent_contact['nick']) && (! in_array('@' . $parent_contact['nick'],$tags))) {
-               $body = '@' . $parent_contact['nick'] . ' ' . $body;
-               $tags[] = '@' . $parent_contact['nick'];
+               && ($parent_contact['nick']) && (!in_array('@'.$parent_contact['nick'].'+'.$parent_contact['id'],$tags))) {
+               $body = '@'.$parent_contact['nick'].'+'.$parent_contact['id'].' '.$body;
+               $tags[] = '@'.$parent_contact['nick'].'+'.$parent_contact['id'];
        }
 
        $tagged = array();