From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 2 Oct 2019 02:53:17 +0000 (+0200)
Subject: Fix featured hashtag URL being interpreted as media or with_replies (#12048)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=fa7dd5c2cdadb6d1f309857f1634651b24dcb46b;p=mastodon.git

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

Fix #12034
---

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?