zelo72
/
mastodon
mirror of https://github.com/mastodon/mastodon
2
2
Fork 1
Code Issues 10 Releases Wiki Activity

Fix featured hashtag URL being interpreted as media or with_replies (#12048) 

Fix #12034
This commit is contained in:
Eugen Rochko 2019-10-02 04:53:17 +02:00 committed by GitHub
parent c7adf80827
commit fa7dd5c2cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/accounts_controller.rb
View File

@ -129,11 +129,11 @@ class AccountsController < ApplicationController
end end
def media_requested? def media_requested?
request.path.ends_with?('/media') request.path.ends_with?('/media') && !tag_requested?
end end
def replies_requested? def replies_requested?
request.path.ends_with?('/with_replies') request.path.ends_with?('/with_replies') && !tag_requested?
end end
def tag_requested? def tag_requested?