reply_to is now stored on the notice, not on the reply record

darcs-hash:20080709202346-84dde-63561db24b55e98020c00707cc2c36e46bb8025f.gz

diff --git a/actions/replies.php b/actions/replies.php
index e4910340dd0ff1089e46e6b8f9e6b595f6fce1a0..d7c1d7a80912caab09d3d4b4315a88e9084491eb 100644 (file)
--- 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 58ac6e5d5cda221c082aa8769819c0367d1346cd..65d67d92d4d693e946b006f537d6cb18378f7576 100644 (file)
--- 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',