GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

upgrade script makes sure all notices have rendered copies

This commit is contained in:
Mikael Nordfeldth 2016-01-01 18:29:44 +01:00
parent ad4beb9091
commit 54325e266f
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
actions/noticesearch.php
View 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');
}