fix hiding image attachments when article contains image in unexpanded combined mode...

diff --git a/functions.php b/functions.php
index 8c8f6fe9268e44d318d5b674f16c9216b15979e3..93241fda3ae68635f3b022fae3204c87d8467961 100644 (file)
--- 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 = ".