fix hiding image attachments when article contains image in unexpanded combined mode (closes #368)

This commit is contained in:
Andrew Dolgov 2011-09-21 08:59:35 +04:00
parent 6d634e0055
commit b67897bff4
1 changed files with 4 additions and 8 deletions

View File

@ -5472,22 +5472,18 @@
}
}
if ($expand_cdm) {
$article_content = sanitize_rss($link, $line["content_preview"],
false, false, $feed_site_url);
if (!$article_content) $article_content = " ";
} else {
$article_content = '';
}
$reply['content'] .= "<div id=\"POSTNOTE-$id\">";
if ($line['note']) {
$reply['content'] .= format_article_note($id, $line['note']);
}
$reply['content'] .= "</div>";
$reply['content'] .= "<span id=\"CWRAP-$id\">$article_content</span>";
$reply['content'] .= "<span id=\"CWRAP-$id\">";
$reply['content'] .= $expand_cdm ? $article_content : '';
$reply['content'] .= "</span>";
$tmp_result = db_query($link, "SELECT always_display_enclosures FROM
ttrss_feeds WHERE id = ".