outputHeadlinesList: properly handle always_display_enclosures when feed_id is null

diff --git a/functions.php b/functions.php
index cdbfa4cae440986c621442839d21cfba99b0256b..527e78f8542804b3045ef5d70544e2499f7c106e 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -5520,7 +5520,9 @@
                                }
 
                                $tmp_result = db_query($link, "SELECT always_display_enclosures FROM
-                                       ttrss_feeds WHERE id = ".$line['feed_id']." AND owner_uid = ".$_SESSION["uid"]);
+                                       ttrss_feeds WHERE id = ".
+                                               (($line['feed_id'] == null) ? $line['orig_feed_id'] : 
+                                                               $line['feed_id'])." AND owner_uid = ".$_SESSION["uid"]);
 
                                $always_display_enclosures = db_fetch_result($tmp_result, 0, "always_display_enclosures");