diff --git a/actions/replies.php b/actions/replies.php index e4910340dd..d7c1d7a809 100644 --- a/actions/replies.php +++ b/actions/replies.php @@ -95,7 +95,7 @@ class RepliesAction extends StreamAction { if (!$result) { continue; } - $this->show_notice($notice, $reply->replied_id); + $this->show_notice($notice); } else { // shouldn't happen! break; diff --git a/lib/stream.php b/lib/stream.php index 58ac6e5d5c..65d67d92d4 100644 --- a/lib/stream.php +++ b/lib/stream.php @@ -57,7 +57,7 @@ class StreamAction extends Action { common_element_end('ul'); } - function show_notice($notice, $replied_id=NULL) { + function show_notice($notice) { global $config; $profile = $notice->getProfile(); # XXX: RDFa @@ -93,12 +93,12 @@ class StreamAction extends Action { 'href' => $noticeurl, 'title' => common_exact_date($notice->created)), common_date_string($notice->created)); - if ($replied_id) { - $replyurl = common_local_url('shownotice', array('notice' => $replied_id)); - common_text('('); + if ($notice->reply_to) { + $replyurl = common_local_url('shownotice', array('notice' => $notice->reply_to)); + common_text(' ('); common_element('a', array('class' => 'inreplyto', 'href' => $replyurl), - _t(' in reply to...')); + _t('in reply to...')); common_text(')'); } common_element_start('a',