diff options
| author | Andrew Dolgov <[email protected]> | 2011-11-11 12:50:34 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2011-11-11 12:50:37 +0400 |
| commit | c0644ee424ead2e1c145ed8756738d4bd8d359d4 (patch) | |
| tree | d65366150ed32b97937d3b2647166ea36e8b4fc4 /functions.php | |
| parent | ca5133cb91c8fe450eaf6ce03a8472823a2a6e07 (diff) | |
remove redundant always_display_enclosure queries
Diffstat (limited to 'functions.php')
| -rw-r--r-- | functions.php | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/functions.php b/functions.php index fd89f5099..0fd2a802f 100644 --- a/functions.php +++ b/functions.php @@ -3698,6 +3698,7 @@ updated, label_cache, tag_cache, + always_display_enclosures, note, unread,feed_id,marked,published,link,last_read,orig_feed_id, ".SUBSTRING_FOR_DATE."(last_read,1,19) as last_read_noms, @@ -3736,6 +3737,8 @@ "feed_id," . "orig_feed_id," . "marked," . + "tag_cache," . + "label_cache," . "link," . "last_read," . SUBSTRING_FOR_DATE . "(last_read,1,19) as last_read_noms," . @@ -5522,13 +5525,15 @@ $reply['content'] .= $expand_cdm ? $article_content : ''; $reply['content'] .= "</span>"; - $tmp_result = db_query($link, "SELECT always_display_enclosures FROM +/* $tmp_result = db_query($link, "SELECT always_display_enclosures FROM ttrss_feeds WHERE id = ". (($line['feed_id'] == null) ? $line['orig_feed_id'] : - $line['feed_id'])." AND owner_uid = ".$_SESSION["uid"]); + $line['feed_id'])." AND owner_uid = ".$_SESSION["uid"]); $always_display_enclosures = sql_bool_to_bool(db_fetch_result($tmp_result, - 0, "always_display_enclosures")); + 0, "always_display_enclosures")); */ + + $always_display_enclosures = sql_bool_to_bool($line["always_display_enclosures"]); $reply['content'] .= format_article_enclosures($link, $id, $always_display_enclosures, $article_content); |