diff options
| author | Andrew Dolgov <[email protected]> | 2012-03-29 15:03:48 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2012-03-29 15:03:48 +0400 |
| commit | 442456184c23b8da36d6f9e0ac098d4a57c17659 (patch) | |
| tree | e46a74b131cbcc5af6033ce770cc1088084827be /classes | |
| parent | d4c64ecc77a46c174d64ba6173a92834bbc1f74f (diff) | |
simplify catching up of feeds, do not reload headlines buffer on catchup unless on_catchup_show_next_feed is enabled (closes #442)
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/feeds.php | 19 |
1 files changed, 1 insertions, 18 deletions
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>".
|