From b0acaeafe345e925a9a5bf44f4ad86567eee14c2 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Fri, 26 Feb 2010 13:06:06 -0800 Subject: [PATCH] Check for conversation with unique conversation ID --- lib/noticelist.php | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/lib/noticelist.php b/lib/noticelist.php index 28a563d875..7d1d2828fc 100644 --- a/lib/noticelist.php +++ b/lib/noticelist.php @@ -540,16 +540,13 @@ class NoticeListItem extends Widget function showContext() { $hasConversation = false; - if( !empty($this->notice->conversation) - && $this->notice->conversation != $this->notice->id){ - $hasConversation = true; - }else{ - $conversation = Notice::conversationStream($this->notice->id, 1, 1); - if($conversation->N > 0){ + if (!empty($this->notice->conversation)) { + $conversation = Notice::conversationStream($this->notice->conversation, 1, 1); + if ($conversation->N > 0) { $hasConversation = true; } } - if ($hasConversation){ + if ($hasConversation) { $this->out->text(' '); $convurl = common_local_url('conversation', array('id' => $this->notice->conversation)); -- 2.39.5