valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove redundant always_display_enclosure queries

This commit is contained in:
Andrew Dolgov 2011-11-11 12:50:34 +04:00
parent ca5133cb91
commit c0644ee424
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
functions.php
View File

@ -3698,6 +3698,7 @@
updated, updated,
label_cache, label_cache,
tag_cache, tag_cache,
always_display_enclosures,
note, note,
unread,feed_id,marked,published,link,last_read,orig_feed_id, unread,feed_id,marked,published,link,last_read,orig_feed_id,
".SUBSTRING_FOR_DATE."(last_read,1,19) as last_read_noms, ".SUBSTRING_FOR_DATE."(last_read,1,19) as last_read_noms,
@ -3736,6 +3737,8 @@
"feed_id," . "feed_id," .
"orig_feed_id," . "orig_feed_id," .
"marked," . "marked," .
"tag_cache," .
"label_cache," .
"link," . "link," .
"last_read," . "last_read," .
SUBSTRING_FOR_DATE . "(last_read,1,19) as last_read_noms," . SUBSTRING_FOR_DATE . "(last_read,1,19) as last_read_noms," .
@ -5522,13 +5525,15 @@
$reply['content'] .= $expand_cdm ? $article_content : ''; $reply['content'] .= $expand_cdm ? $article_content : '';
$reply['content'] .= "</span>"; $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 = ". ttrss_feeds WHERE id = ".
(($line['feed_id'] == null) ? $line['orig_feed_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, $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, $reply['content'] .= format_article_enclosures($link, $id, $always_display_enclosures,
$article_content); $article_content);