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 4060535313f0923a3bc632bac3bd5a588c8c1580..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');
                }
        }