X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fnoticesearch.php;h=bcd2eb5065009597d1f079e5b89f109fed6d3a3b;hb=d6b28c64830f632bb2f4b6f3c9369b9e56ad217a;hp=b4401ee17bea40ea4f5172418e16bf1f8d0a2143;hpb=26703076f66f77f337559416cc02101c532d7aa8;p=quix0rs-gnu-social.git diff --git a/actions/noticesearch.php b/actions/noticesearch.php index b4401ee17b..bcd2eb5065 100644 --- a/actions/noticesearch.php +++ b/actions/noticesearch.php @@ -186,7 +186,7 @@ class SearchNoticeList extends NoticeList { $this->terms = $terms; } - function newListItem($notice) + function newListItem(Notice $notice) { return new SearchNoticeListItem($notice, $this->out, $this->terms); } @@ -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'); }