diff options
author | Andrew Dolgov <[email protected]> | 2015-07-13 12:46:05 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2015-07-13 12:46:05 +0300 |
commit | 4f9a3c0e0f995b5ad8eed5357df3d12beb8bee00 (patch) | |
tree | 43b8e2eb0757095b80ed877ae1c379b7f0463f2e /plugins/vf_shared/init.php | |
parent | c939dfc39645f6fd687dd926c50286eda4b2c2df (diff) | |
parent | 402073d6a1845f5874da67aa055e733cd2ae693a (diff) |
Merge branch 'master' of git.fakecake.org:tt-rss
Conflicts:
classes/pref/filters.php
Diffstat (limited to 'plugins/vf_shared/init.php')
-rw-r--r-- | plugins/vf_shared/init.php | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/plugins/vf_shared/init.php b/plugins/vf_shared/init.php index c7eac9659..3138c8a7d 100644 --- a/plugins/vf_shared/init.php +++ b/plugins/vf_shared/init.php @@ -35,7 +35,7 @@ class VF_Shared extends Plugin { //function queryFeedHeadlines($feed, $limit, $view_mode, $cat_view, $search, $search_mode, $override_order = false, $offset = 0, $owner_uid = 0, $filter = false, $since_id = 0, $include_children = false, $ignore_vfeed_group = false, $override_strategy = false, $override_vfeed = false) { function get_headlines($feed_id, $options) { - $qfh_ret = queryFeedHeadlines(-4, + /*$qfh_ret = queryFeedHeadlines(-4, $options['limit'], $this->get_unread(-1) > 0 ? "adaptive" : "all_articles", false, @@ -49,8 +49,23 @@ class VF_Shared extends Plugin { $options['include_children'], false, "uuid != ''", - "ttrss_feeds.title AS feed_title,"); + "ttrss_feeds.title AS feed_title,"); */ + $params = array( + "feed" => -4, + "limit" => $options["limit"], + "view_mode" => $this->get_unread(-1) > 0 ? "adaptive" : "all_articles", + "search" => $options['search'], + "override_order" => $options['override_order'], + "offset" => $options["offset"], + "filter" => $options["filter"], + "since_id" => $options["since_id"], + "include_children" => $options["include_children"], + "override_strategy" => "uuid != ''", + "override_vfeed" => "ttrss_feeds.title AS feed_title," + ); + + $qfh_ret = queryFeedHeadlines($params); $qfh_ret[1] = __("Shared articles"); return $qfh_ret; |