public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-13 11:45:56 +00:00
Code Issues Releases Wiki Activity

add a hack to prevent loading of stuff for hidden content in unexpanded combined mode (refs #602)

Browse Source
This commit is contained in:
Andrew Dolgov
2013-03-20 13:17:48 +04:00
parent 81153e6b8b
commit f0540b598a
4 changed files with 85 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
classes/feeds.php
View File

@@ -263,6 +263,8 @@ class Feeds extends Handler_Protected {
if ($_REQUEST["debug"]) $timing_info = print_checkpoint("PS", $timing_info);
$expand_cdm = get_pref($this->link, 'CDM_EXPANDED');
while ($line = db_fetch_assoc($result)) {
$class = ($lnum % 2) ? "even" : "odd";
@@ -512,8 +514,6 @@ class Feeds extends Handler_Protected {
}
}
$expand_cdm = get_pref($this->link, 'CDM_EXPANDED');
$mouseover_attrs = "onmouseover='postMouseIn($id)'
onmouseout='postMouseOut($id)'";
@@ -627,17 +627,18 @@ class Feeds extends Handler_Protected {
}
$reply['content'] .= "<span id=\"CWRAP-$id\">";
$reply['content'] .= $line["content"];
if (!$expand_cdm) {
$reply['content'] .= "<span id=\"CENCW-$id\">";
$reply['content'] .= htmlspecialchars($line["content"]);
$reply['content'] .= "</span.";
} else {
$reply['content'] .= $line["content"];
}
$reply['content'] .= "</span>";
/* $tmp_result = db_query($this->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"]);
$always_display_enclosures = sql_bool_to_bool(db_fetch_result($tmp_result,
0, "always_display_enclosures")); */
$always_display_enclosures = sql_bool_to_bool($line["always_display_enclosures"]);
$reply['content'] .= format_article_enclosures($this->link, $id, $always_display_enclosures,
@@ -945,6 +946,5 @@ class Feeds extends Handler_Protected {
return $reply;
}
}
?>