Merge pull request #10045 from annando/fix-notification

[friendica.git] / include / conversation.php

diff --git a/include/conversation.php b/include/conversation.php
index 193dc33e2f93b218e3525bc6aafd0a690bf7a7e7..cef0bc0e80e0da21858e53193965d8bd6f7c887e 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -145,7 +145,7 @@ function localize_item(&$item)
                $item['body'] = item_redir_and_replace_images($extracted['body'], $extracted['images'], $item['contact-id']);
        }
 
-       /// @todo The following functionality needs to be cleaned up. 
+       /// @todo The following functionality needs to be cleaned up.
        if (!empty($item['verb'])) {
                $activity = DI::activity();
 
@@ -481,7 +481,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
                'attendyes'   => [],
                'attendno'    => [],
                'attendmaybe' => [],
-               'announce'    => [],    
+               'announce'    => [],
        ];
 
        if (DI::pConfig()->get(local_user(), 'system', 'hide_dislike')) {
@@ -839,8 +839,8 @@ function conversation_add_children(array $parents, $block_authors, $order, $uid)
                                $activity = ['causer-id' => $parent['author-id']];
                                foreach (['commented', 'received', 'created'] as $orderfields) {
                                        if (!empty($parent[$orderfields])) {
-                                               $activity[$orderfields] = $parent[$orderfields];        
-                                       }       
+                                               $activity[$orderfields] = $parent[$orderfields];
+                                       }
                                }
                        }
                } else {
@@ -899,7 +899,7 @@ function item_photo_menu($item) {
        $block_link = '';
        $ignore_link = '';
 
-       if (local_user() && local_user() == $item['uid'] && $item['gravity'] == GRAVITY_PARENT && !$item['self']) {
+       if (local_user() && local_user() == $item['uid'] && $item['gravity'] == GRAVITY_PARENT && !$item['self'] && !$item['mention']) {
                $sub_link = 'javascript:doFollowThread(' . $item['id'] . '); return false;';
        }