summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2010-10-11 11:24:29 +0400
committerAndrew Dolgov <[email protected]>2010-10-11 11:24:29 +0400
commita16a62c02d36668877b81487f8e3e363e203a979 (patch)
treeb67a2c959a46df77f91c8ffdeebf933af3cb099e
parentfb45339a81ace9759df5e904860176b2d839d01c (diff)
outputHeadlinesList: properly handle always_display_enclosures when feed_id is null
-rw-r--r--functions.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/functions.php b/functions.php
index cdbfa4cae..527e78f85 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");