Merge conflicts and kill a whole lot of trailing whitespace on lines.

[quix0rs-gnu-social.git] / actions / showstream.php

diff --git a/actions/showstream.php b/actions/showstream.php
index d1d040a276d5db5930942d555c86f865c3df0d68..2a2d9d3b4de6d78b2f973fbfa2f8213258f1106a 100644 (file)
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -375,14 +375,6 @@ class ShowstreamAction extends StreamAction {
                                                                  'href' => $noticeurl,
                                                                  'title' => common_exact_date($notice->created)),
                                           common_date_string($notice->created));
-               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...'));
-                       common_text(')');
-               }
                common_element_start('a', 
                                                         array('href' => common_local_url('newnotice',
                                                                                                                          array('replyto' => $profile->nickname)),