summaryrefslogtreecommitdiff
path: root/functions.php
diff options
context:
space:
mode:
Diffstat (limited to 'functions.php')
-rw-r--r--functions.php12
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 = ".