From fa7dd5c2cdadb6d1f309857f1634651b24dcb46b Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 2 Oct 2019 04:53:17 +0200
Subject: [PATCH] Fix featured hashtag URL being interpreted as media or
with_replies (#12048)
Fix #12034
---
app/controllers/accounts_controller.rb | 4 ++--
1 file 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?