subtoolbar: remove catchupPage, label confusing with upper toolbar catchup function

diff --git a/classes/feeds.php b/classes/feeds.php
index 2b00b848d2ad176fb4b47c047c6dd4da5eebc0eb..0b46155cf4b282e42fece79242489b35b374b784 100644 (file)
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -133,7 +133,7 @@ class Feeds extends Handler_Protected {
 
                $reply .= "<option value=\"0\" disabled=\"1\">".__('Feed:')."</option>";
 
 
                $reply .= "<option value=\"0\" disabled=\"1\">".__('Feed:')."</option>";
 

-               $reply .= "<option value=\"catchupPage()\">".__('Mark as read')."</option>";
+               //$reply .= "<option value=\"catchupPage()\">".__('Mark as read')."</option>";

 
                $reply .= "<option value=\"displayDlg('generatedFeed', '$feed_id:$is_cat:$rss_link')\">".__('View as RSS')."</option>";
 
 
                $reply .= "<option value=\"displayDlg('generatedFeed', '$feed_id:$is_cat:$rss_link')\">".__('View as RSS')."</option>";
 

diff --git a/js/viewfeed.js b/js/viewfeed.js
index 664eba39346b21e82f723830a31330fc5f964848..27d0c01b451896bf752001d2d2a5d6ac30eb6806 100644 (file)
--- a/js/viewfeed.js
+++ b/js/viewfeed.js
@@ -941,23 +941,6 @@ function selectArticles(mode) {
        }
 }
 
        }
 }
 

-function catchupPage() {
-
-       var fn = getFeedName(getActiveFeedId(), activeFeedIsCat());
-
-       var str = __("Mark all visible articles in %s as read?");
-
-       str = str.replace("%s", fn);
-
-       if (getInitParam("confirm_feed_catchup") == 1 && !confirm(str)) {
-               return;
-       }
-
-       selectArticles('all');
-       selectionToggleUnread(false, 'viewCurrentFeed()', true);
-       selectArticles('none');
-}
-

 function deleteSelection() {
 
        try {
 function deleteSelection() {
 
        try {