diff options
| author | Mike Cochrane <mikec@mikenz.geek.nz> | 2008-07-09 18:46:30 -0400 |
|---|---|---|
| committer | Mike Cochrane <mikec@mikenz.geek.nz> | 2008-07-09 18:46:30 -0400 |
| commit | 4b656f47dff2bd6eed4dcfad060b8434d052d883 (patch) | |
| tree | 6acc353a739f712ecbca9d825dcb7fa16f429ff1 /actions/showstream.php | |
| parent | 67921b1c1871e881f71f8f15aa7fc9c2b11da64d (diff) | |
Merge conflicts and kill a whole lot of trailing whitespace on lines.
darcs-hash:20080709224630-533db-b5399baef280133858dac9b89c2cd6a2aba9f861.gz
Diffstat (limited to 'actions/showstream.php')
| -rw-r--r-- | actions/showstream.php | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/actions/showstream.php b/actions/showstream.php index d1d040a27..2a2d9d3b4 100644 --- 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)), |