From d00942cce185e24e5d67a1e2ccb92faf5be7d1d4 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 9 Apr 2010 11:36:51 -0700
Subject: Fix for conversation check in @-reply notification email; i18n
 cleanup on mail messages: fixed some bad gettext usage, added trans doc
 comments.

---
 lib/noticelist.php | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

(limited to 'lib/noticelist.php')

diff --git a/lib/noticelist.php b/lib/noticelist.php
index 83c8de9f6..4f997a328 100644
--- 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
-- 
cgit v1.2.3-54-g00ecf