From: Mikael Nordfeldth <mmn@hethane.se>
Date: Fri, 1 Jan 2016 17:29:44 +0000 (+0100)
Subject: upgrade script makes sure all notices have rendered copies
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=54325e266f03be053b4efb1e788ef370b96f0cdc;p=quix0rs-gnu-social.git

upgrade script makes sure all notices have rendered copies
---

diff --git a/actions/noticesearch.php b/actions/noticesearch.php
index ee7bb86f40..fd8fdf68e5 100644
--- a/actions/noticesearch.php
+++ b/actions/noticesearch.php
@@ -203,14 +203,7 @@ class SearchNoticeListItem extends NoticeListItem {
     {
         // FIXME: URL, image, video, audio
         $this->out->elementStart('p', array('class' => 'e-content'));
-        if ($this->notice->rendered) {
-            $this->out->raw($this->highlight($this->notice->rendered, $this->terms));
-        } else {
-            // XXX: may be some uncooked notices in the DB,
-            // we cook them right now. This should probably disappear in future
-            // versions (>> 0.4.x)
-            $this->out->raw($this->highlight(common_render_content($this->notice->content, $this->notice), $this->terms));
-        }
+        $this->out->raw($this->highlight($this->notice->getRendered(), $this->terms));
         $this->out->elementEnd('p');
 
     }