diff options
| author | Andrew Dolgov <[email protected]> | 2011-09-21 08:59:35 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2011-09-21 08:59:35 +0400 |
| commit | b67897bff4cfd94508d24268353fc1815ef54b9c (patch) | |
| tree | b5cbe1089527522e6cf238be12934d15181cf38e /functions.php | |
| parent | 6d634e0055c01246e63bbd472bd47a7c3a59eb42 (diff) | |
fix hiding image attachments when article contains image in unexpanded combined mode (closes #368)
Diffstat (limited to 'functions.php')
| -rw-r--r-- | functions.php | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/functions.php b/functions.php index 8c8f6fe92..93241fda3 100644 --- a/functions.php +++ b/functions.php @@ -5472,22 +5472,18 @@ } } - if ($expand_cdm) { - $article_content = sanitize_rss($link, $line["content_preview"], + $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 = ". |