summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZach Copley <zach@status.net>2010-02-26 13:06:06 -0800
committerZach Copley <zach@status.net>2010-02-26 13:06:06 -0800
commitb0acaeafe345e925a9a5bf44f4ad86567eee14c2 (patch)
tree8fae29d547d76ddb7b879fa7793eb768bb3874e2
parente4c462570f8010f751caf214f329617c08bf7105 (diff)
Check for conversation with unique conversation ID
-rw-r--r--lib/noticelist.php11
1 files changed, 4 insertions, 7 deletions
diff --git a/lib/noticelist.php b/lib/noticelist.php
index 28a563d87..7d1d2828f 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));