diff options
author | ThibG <thib@sitedethib.com> | 2019-03-13 16:55:07 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-13 16:55:07 +0100 |
commit | 3005e473a0df4d2ea942dcc33e01c5e4c15b81fa (patch) | |
tree | 8d0b0e635bf12a56ae99278ab206684da2a9aad1 /app/controllers/accounts_controller.rb | |
parent | c2857c976c7d4a8bbd02c3c18569913f2bf8a034 (diff) | |
parent | 387f253f3100317ae247928aa9168f431879ecb6 (diff) |
Merge pull request #957 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/accounts_controller.rb')
-rw-r--r-- | app/controllers/accounts_controller.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb index 442e99089..022355bd0 100644 --- a/app/controllers/accounts_controller.rb +++ b/app/controllers/accounts_controller.rb @@ -81,7 +81,13 @@ class AccountsController < ApplicationController end def hashtag_scope - Status.tagged_with(Tag.find_by(name: params[:tag].downcase)&.id) + tag = Tag.find_normalized(params[:tag]) + + if tag + Status.tagged_with(tag.id) + else + Status.none + end end def set_account |