re-add ForceUpdate to viewfeed for update debugging, add some filter debugging

2 files changed, 10 insertions, 2 deletions

diff --git a/functions.php b/functions.php
index 4737e60ee..64269aada 100644
--- a/functions.php
+++ b/functions.php
@@ -766,6 +766,10 @@
 
 			$filters = load_filters($link, $feed, $owner_uid);
 
+			if (defined('DAEMON_EXTENDED_DEBUG') || $_REQUEST['xdebug']) {
+				print_r($filters);
+			}
+
 			if ($use_simplepie) {
 				$iterator = $rss->get_items();
 			} else {
@@ -4777,6 +4781,10 @@
 			catchupArticlesById($link, $ids, $cmode);
 		}
 
+		if ($subop == "ForceUpdate" && sprintf("%d", $feed) > 0) {
+			update_rss_feed($link, $feed, true);
+		}
+
 		if ($subop == "MarkAllRead")  {
 			catchup_feed($link, $feed, $cat_view);
 
diff --git a/tt-rss.js b/tt-rss.js
index 9c8f5590a..4cb3ec563 100644
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -836,7 +836,7 @@ function hotkey_handler(e) {
 
 			if (keycode == 82) { // r
 				if (getActiveFeedId()) {
-					viewfeed(getActiveFeedId(), "ForceUpdate", activeFeedIsCat());
+					viewfeed(getActiveFeedId(), '', activeFeedIsCat());
 					return;
 				}
 			}
@@ -848,7 +848,7 @@ function hotkey_handler(e) {
 
 			if (keycode == 85) { // u
 				if (getActiveFeedId()) {
-					viewfeed(getActiveFeedId(), "ForceUpdate");
+					viewfeed(getActiveFeedId(), '');
 					return false;
 				}
 			}