Pull conversation URL from Conversation instead of assuming it's local

1 files changed, 28 insertions, 7 deletions

diff --git a/lib/noticelist.php b/lib/noticelist.php
index 7d1d2828f..88a925241 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -541,18 +541,39 @@ class NoticeListItem extends Widget
     {
         $hasConversation = false;
         if (!empty($this->notice->conversation)) {
-            $conversation = Notice::conversationStream($this->notice->conversation, 1, 1);
+            $conversation = Notice::conversationStream(
+                $this->notice->conversation,
+                1,
+                1
+            );
             if ($conversation->N > 0) {
                 $hasConversation = true;
             }
         }
         if ($hasConversation) {
-            $this->out->text(' ');
-            $convurl = common_local_url('conversation',
-                                         array('id' => $this->notice->conversation));
-            $this->out->element('a', array('href' => $convurl.'#notice-'.$this->notice->id,
-                                           'class' => 'response'),
-                                _('in context'));
+            $conv = Conversation::staticGet(
+                'id',
+                $this->notice->conversation
+            );
+            $convurl = $conv->uri;
+            if (!empty($convurl)) {
+                $this->out->text(' ');
+                $this->out->element(
+                    'a',
+                    array(
+                    'href' => $convurl.'#notice-'.$this->notice->id,
+                    'class' => 'response'),
+                    _('in context')
+                );
+            } else {
+                $msg = sprintf(
+                    "Couldn't find Conversation ID %d to make 'in context'"
+                    . "link for Notice ID %d",
+                    $this->notice->conversation,
+                    $this->notice->id
+                );
+                common_log(LOG_WARNING, $msg);
+            }
         }
     }