fix various cat-related bugs

feedlist.js

@@ -75,7 +75,7 @@ function viewfeed(feed, subop, is_cat, subop_param) {
 
 			var show_next_feed = parent.getInitParam("on_catchup_show_next_feed") == "1";
 
-			if (next_unread_feed && show_next_feed) {
+			if (next_unread_feed && show_next_feed && !activeFeedIsCat()) {
 				query = query + "&nuf=" + param_escape(next_unread_feed);
 				setActiveFeedId(next_unread_feed);
 			}

functions.js

@@ -469,6 +469,7 @@ function activeFeedIsCat() {
 function setActiveFeedId(id) {
 //	return setCookie("ttrss_vf_actfeed", id);
 	try {
+		debug("sAFID(" + id + ")");
 		getMainContext().active_feed_id = id;
 	} catch (e) {
 		exception_error("setActiveFeedId", e);

functions.php

@@ -2001,7 +2001,6 @@
 	}
 
 	function queryFeedHeadlines($link, $feed, $limit, $view_mode, $cat_view, $search, $search_mode, $match_on, $override_order = false) {
-
 			if ($search) {
 			
 				$search_query_part = getSearchSql($search, $match_on);

tt-rss.js

@@ -207,7 +207,7 @@ function updateFeedList(silent, fetch) {
 		query_str = query_str + "&tags=1";
 	}
 
-	if (getActiveFeedId() != undefined) {
+	if (getActiveFeedId() && !activeFeedIsCat()) {
 		query_str = query_str + "&actid=" + getActiveFeedId();
 	}
 
@@ -447,7 +447,7 @@ function quickMenuGo(opid) {
 		if (opid == "qmcRemoveFeed") {
 			var actid = getActiveFeedId();
 	
-			if (actid == undefined) {
+			if (!actid || activeFeedIsCat()) {
 				alert("Please select some feed first.");
 				return;
 			}