]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
upgrade script makes sure all notices have rendered copies
authorMikael Nordfeldth <mmn@hethane.se>
Fri, 1 Jan 2016 17:29:44 +0000 (18:29 +0100)
committerMikael Nordfeldth <mmn@hethane.se>
Fri, 1 Jan 2016 17:30:38 +0000 (18:30 +0100)
actions/noticesearch.php

index ee7bb86f40a28f7fac5aba0dc8a848a4268c68d8..fd8fdf68e52f38139956ab5350aca4e1cee44a97 100644 (file)
@@ -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');
 
     }