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

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

diff --git a/actions/showstream.php b/actions/showstream.php
index c4061da4fdd4431cdd7c4620800e291d8169bdca..eed63fab34f58c989292253ea8306b54d8a9b4a0 100644 (file)
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -344,7 +344,14 @@ class ShowstreamAction extends StreamAction {
                if ($notice->find(true)) {
                        # FIXME: URL, image, video, audio
                        common_element_start('p', array('class' => 'notice_current'));
-                       common_raw(common_render_content($notice->content, $notice));
+                       if ($notice->rendered) {
+                               common_raw($notice->rendered);
+                       } else {
+                               # XXX: may be some uncooked notices in the DB,
+                               # we cook them right now. This can probably disappear in future
+                               # versions (>> 0.4.x)
+                               common_raw(common_render_content($notice->content, $notice));
+                       }
                        common_element_end('p');
                }
        }
@@ -364,7 +371,6 @@ class ShowstreamAction extends StreamAction {
                                                                  'href' => $noticeurl,
                                                                  'title' => common_exact_date($notice->created)),
                                           common_date_string($notice->created));
-               common_element_end('p');
                common_element_start('a', 
                                                         array('href' => common_local_url('newnotice',
                                                                                                                          array('replyto' => $profile->nickname)),
@@ -372,6 +378,8 @@ class ShowstreamAction extends StreamAction {
                                                                   'title' => _t('reply'),
                                                                   'class' => 'replybutton'));
                common_raw('→');
+               common_element_end('a');
+               common_element_end('p');
                common_element_end('li');
        }
 }
\ No newline at end of file