about summary refs log tree commit diff
path: root/app/controllers
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2019-10-02 04:53:17 +0200
committerGitHub <noreply@github.com>2019-10-02 04:53:17 +0200
commitfa7dd5c2cdadb6d1f309857f1634651b24dcb46b (patch)
tree4cca81ad4386b5140d2dd7f9be1159d371673997 /app/controllers
parentc7adf8082726ed3059de1c09bcc7b1cde5ca2909 (diff)
Fix featured hashtag URL being interpreted as media or with_replies (#12048)
Fix #12034
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/accounts_controller.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index 1dab5d5f2..9c7ef6170 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -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?