summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2017-03-31 11:21:35 +0300
committerAndrew Dolgov <[email protected]>2017-03-31 11:21:35 +0300
commit337535416f3d75f94a34c64e785f1c2200844013 (patch)
tree4b58123da211193adda174a2c78b7e9979fa09a4 /classes
parent86e534290e2c9ce772481e70aeb4148dde7539b4 (diff)
filter by search results while marking feed as read
Diffstat (limited to 'classes')
-rwxr-xr-xclasses/feeds.php1
-rwxr-xr-xclasses/rpc.php4
2 files changed, 4 insertions, 1 deletions
diff --git a/classes/feeds.php b/classes/feeds.php
index 014c5e364..48c4ad199 100755
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -300,6 +300,7 @@ class Feeds extends Handler_Protected {
make_local_datetime($qfh_ret[4], false) : __("Never");
$highlight_words = $qfh_ret[5];
$reply['first_id'] = $qfh_ret[6];
+ $reply['search_query'] = [$search, $search_language];
$vgroup_last_feed = $vgr_last_feed;
diff --git a/classes/rpc.php b/classes/rpc.php
index fd10a3a49..ca8ce39ad 100755
--- a/classes/rpc.php
+++ b/classes/rpc.php
@@ -450,8 +450,10 @@ class RPC extends Handler_Protected {
$feed_id = $this->dbh->escape_string($_REQUEST['feed_id']);
$is_cat = $this->dbh->escape_string($_REQUEST['is_cat']) == "true";
$mode = $this->dbh->escape_string($_REQUEST['mode']);
+ $search_query = $this->dbh->escape_string($_REQUEST['search_query']);
+ $search_lang = $this->dbh->escape_string($_REQUEST['search_lang']);
- catchup_feed($feed_id, $is_cat, false, false, $mode);
+ catchup_feed($feed_id, $is_cat, false, false, $mode, [$search_query, $search_lang]);
print json_encode(array("message" => "UPDATE_COUNTERS"));
}