summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@prodromou.name>2008-07-09 16:23:46 -0400
committerEvan Prodromou <evan@prodromou.name>2008-07-09 16:23:46 -0400
commite22df4be30edbdad436c36df13fba38d1ca35467 (patch)
tree12623ac1c6041d93eabd6cdfbce9cc8dc8e3a2b3
parented4854f52da11527016e20c20eea08d777b416ae (diff)
reply_to is now stored on the notice, not on the reply record
darcs-hash:20080709202346-84dde-63561db24b55e98020c00707cc2c36e46bb8025f.gz
-rw-r--r--actions/replies.php2
-rw-r--r--lib/stream.php10
2 files changed, 6 insertions, 6 deletions
diff --git a/actions/replies.php b/actions/replies.php
index e4910340d..d7c1d7a80 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 58ac6e5d5..65d67d92d 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',