diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-02-26 21:15:19 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-26 21:15:19 +0100 |
| commit | 551820cbd9e5beebd16f16205143e2263d4f2d51 (patch) | |
| tree | 6868722efeb660c0031a22aecfdc4b2c5bc9dcc6 /app/controllers/api/v1/trends/links_controller.rb | |
| parent | e48eaf64cc7cb0cfab388331c4823ee5fb580d59 (diff) | |
| parent | 67c6f37e269a4ebb538e019351f894183f3c1439 (diff) | |
Merge pull request #1704 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/api/v1/trends/links_controller.rb')
| -rw-r--r-- | app/controllers/api/v1/trends/links_controller.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/controllers/api/v1/trends/links_controller.rb b/app/controllers/api/v1/trends/links_controller.rb index 1c3ab1e1c..ad20e7f8b 100644 --- a/app/controllers/api/v1/trends/links_controller.rb +++ b/app/controllers/api/v1/trends/links_controller.rb @@ -12,10 +12,14 @@ class Api::V1::Trends::LinksController < Api::BaseController def set_links @links = begin if Setting.trends - Trends.links.get(true, limit_param(10)) + links_from_trends else [] end end end + + def links_from_trends + Trends.links.query.allowed.in_locale(content_locale).limit(limit_param(10)) + end end |