diff options
| author | Andrew Dolgov <fox@fakecake.org> | 2025-08-26 08:14:10 +0300 |
|---|---|---|
| committer | Andrew Dolgov <fox@fakecake.org> | 2025-08-26 08:14:10 +0300 |
| commit | 57cd48d9f73478dcd315deb0fd5dab1a756f44fc (patch) | |
| tree | c85532fc30695932c4efe626d29f5488a1781bf1 /classes/Article.php | |
| parent | 2d12ced897397a66853b3bc4b4fdac5b62c40bec (diff) | |
| parent | 9982871ac17c63ae581afaf3e0c2bdcda6aa391c (diff) | |
Merge branch 'bugfix/limit-more-by-uid' into 'master'
Filter more results by user ID.
See merge request tt-rss/tt-rss!181
Diffstat (limited to 'classes/Article.php')
| -rw-r--r-- | classes/Article.php | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/classes/Article.php b/classes/Article.php index e939298bc..c85697d6e 100644 --- a/classes/Article.php +++ b/classes/Article.php @@ -657,8 +657,10 @@ class Article extends Handler_Protected { $entries = ORM::for_table('ttrss_entries') ->table_alias('e') - ->join('ttrss_user_entries', ['ref_id', '=', 'id'], 'ue') - ->where_in('id', $article_ids) + ->select('ue.label_cache') + ->join('ttrss_user_entries', ['ue.ref_id', '=', 'e.id'], 'ue') + ->where_in('e.id', $article_ids) + ->where('ue.owner_uid', $_SESSION['uid']) ->find_many(); $rv = []; @@ -687,8 +689,10 @@ class Article extends Handler_Protected { $entries = ORM::for_table('ttrss_entries') ->table_alias('e') - ->join('ttrss_user_entries', ['ref_id', '=', 'id'], 'ue') - ->where_in('id', $article_ids) + ->select('ue.feed_id') + ->join('ttrss_user_entries', ['ue.ref_id', '=', 'e.id'], 'ue') + ->where_in('e.id', $article_ids) + ->where('ue.owner_uid', $_SESSION['uid']) ->find_many(); $rv = []; |