Merge remote-tracking branch 'upstream/master' into social-master

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

diff --git a/actions/noticesearch.php b/actions/noticesearch.php
index f1d6d1551640b9d771c780a22f4d7f080d648b5f..bcd2eb5065009597d1f079e5b89f109fed6d3a3b 100644 (file)
--- 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');
 
     }