From b67897bff4cfd94508d24268353fc1815ef54b9c Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 21 Sep 2011 08:59:35 +0400
Subject: fix hiding image attachments when article contains image in
 unexpanded combined mode (closes #368)

---
 functions.php | 12 ++++--------
 1 file 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 = "&nbsp;";
-					} 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 = ".
-- 
cgit v1.2.3