]> cat aescling's git repositories - mastodon.git/commitdiff
Fix featured hashtag URL being interpreted as media or with_replies (#12048)
authorEugen Rochko <eugen@zeonfederated.com>
Wed, 2 Oct 2019 02:53:17 +0000 (04:53 +0200)
committerGitHub <noreply@github.com>
Wed, 2 Oct 2019 02:53:17 +0000 (04:53 +0200)
Fix #12034

app/controllers/accounts_controller.rb

index 1dab5d5f26762cd96eb45b74e0a4bc59051adbfe..9c7ef6170aceb93cc0da5fb705c64a63fd345231 100644 (file)
@@ -129,11 +129,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 tag_requested?