From 442456184c23b8da36d6f9e0ac098d4a57c17659 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 29 Mar 2012 15:03:48 +0400
Subject: simplify catching up of feeds, do not reload headlines buffer on
 catchup unless on_catchup_show_next_feed is enabled (closes #442)

---
 classes/feeds.php | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

(limited to 'classes')

diff --git a/classes/feeds.php b/classes/feeds.php
index 2f4870f91..aacad5508 100644
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -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>".
-- 
cgit v1.2.3-54-g00ecf