Fix for conversation check in @-reply notification email; i18n cleanup on mail messag...

[quix0rs-gnu-social.git] / lib / noticelist.php

diff --git a/lib/noticelist.php b/lib/noticelist.php
index 83c8de9f6e0ac3b573846ea92016858d8cd3e187..4f997a3286a78b339644c8a7dd72f32fd31e07ed 100644 (file)
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -543,18 +543,7 @@ class NoticeListItem extends Widget
 
     function showContext()
     {
-        $hasConversation = false;
-        if (!empty($this->notice->conversation)) {
-            $conversation = Notice::conversationStream(
-                $this->notice->conversation,
-                1,
-                1
-            );
-            if ($conversation->N > 0) {
-                $hasConversation = true;
-            }
-        }
-        if ($hasConversation) {
+        if ($this->notice->hasConversation()) {
             $conv = Conversation::staticGet(
                 'id',
                 $this->notice->conversation