diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2019-10-02 04:53:17 +0200 |
---|---|---|
committer | multiple creatures <dev@multiple-creature.party> | 2020-02-20 23:52:04 -0600 |
commit | 2f1ed5a34422a9537a00ac737ece30ae101cc239 (patch) | |
tree | 24304a89070db02dc5e882180254f31c7ef7aa7b /app/controllers/accounts_controller.rb | |
parent | 1ddb4abc704476e56ed97826365a32f21df3c78e (diff) |
Fix featured hashtag URL being interpreted as media or with_replies (#12048)
Fix #12034
Diffstat (limited to 'app/controllers/accounts_controller.rb')
-rw-r--r-- | app/controllers/accounts_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb index 3836fbaac..541a82b2e 100644 --- a/app/controllers/accounts_controller.rb +++ b/app/controllers/accounts_controller.rb @@ -155,11 +155,11 @@ class AccountsController < ApplicationController end def media_requested? - request.path.ends_with?('/media') + request.path.ends_with?('/media') && !tag_requested? end def replies_requested? - request.path.ends_with?('/with_replies') + request.path.ends_with?('/with_replies') && !tag_requested? end def reblogs_requested? |