From: ThibG <thib@sitedethib.com>
Date: Wed, 19 Feb 2020 21:31:53 +0000 (+0100)
Subject: Fix account JSON/RSS not being cacheable due to wrong mime type comparison (#13116)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=d8e9bae482b2921c3a06e6d94c0b8a07cf0c41ff;p=mastodon.git

Fix account JSON/RSS not being cacheable due to wrong mime type comparison (#13116)

`request.format` is not a symbol but a `Mime::Type`, so the condition actually
never matched, and a session was created even for those requests, preventing
caching.
---

diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index 0a8015a56..124393d62 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -9,7 +9,7 @@ class AccountsController < ApplicationController
   before_action :set_cache_headers
   before_action :set_body_classes
 
-  skip_around_action :set_locale, if: -> { [:json, :rss].include?(request.format) }
+  skip_around_action :set_locale, if: -> { [:json, :rss].include?(request.format&.to_sym) }
   skip_before_action :require_functional!
 
   def show