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

simplify catching up of feeds, do not reload headlines buffer on catchup unless on_catchup_show_next_feed is enabled (closes #442)

Browse Source
This commit is contained in:
Andrew Dolgov
2012-03-29 15:03:48 +04:00
parent d4c64ecc77
commit 442456184c
3 changed files with 41 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
classes/feeds.php
View File

@@ -177,28 +177,11 @@ class Feeds extends Protected_Handler {
$method_split = explode(":", $method);
/* if ($method == "CatchupSelected") {
$ids = explode(",", db_escape_string($_REQUEST["ids"]));
$cmode = sprintf("%d", $_REQUEST["cmode"]);
catchupArticlesById($this->link, $ids, $cmode);
} */
if ($method == "ForceUpdate" && $feed && is_numeric($feed) > 0) {
include "rssfuncs.php";
update_rss_feed($this->link, $feed, true);
}
if ($method == "MarkAllRead") {
catchup_feed($this->link, $feed, $cat_view);
if (get_pref($this->link, 'ON_CATCHUP_SHOW_NEXT_FEED')) {
if ($next_unread_feed) {
$feed = $next_unread_feed;
}
}
}
if ($method_split[0] == "MarkAllReadGR") {
catchup_feed($this->link, $method_split[1], false);
}
@@ -443,7 +426,7 @@ class Feeds extends Protected_Handler {
$cur_feed_title = htmlspecialchars($cur_feed_title);
$vf_catchup_link = "(<a onclick='javascript:catchupFeedInGroup($feed_id);' href='#'>".__('mark as read')."</a>)";
$vf_catchup_link = "(<a onclick='catchupFeedInGroup($feed_id);' href='#'>".__('mark as read')."</a>)";
$reply['content'] .= "<div class='cdmFeedTitle'>".
"<div style=\"float : right\">$feed_icon_img</div>".