From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Mon, 11 Oct 2010 07:24:29 +0000 (+0400)
Subject: outputHeadlinesList: properly handle always_display_enclosures when feed_id is null
X-Git-Tag: 1.5.0~435^2~5
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=a16a62c02d36668877b81487f8e3e363e203a979;p=tt-rss.git

outputHeadlinesList: properly handle always_display_enclosures when feed_id is null
---

diff --git a/functions.php b/functions.php
index cdbfa4ca..527e78f8 100644
--- 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");