From da809f9eec45cdac0fa31ba89df91cd4ce4a5398 Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Sun, 7 Jan 2018 23:12:59 +0900
Subject: [PATCH] Fix unintended cache (#6214)
---
app/controllers/application_controller.rb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index f59f2725b6..dae1804c24 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -124,15 +124,15 @@ class ApplicationController < ActionController::Base
def render_cached_json(cache_key, **options)
options[:expires_in] ||= 3.minutes
- options[:public] ||= true
cache_key = cache_key.join(':') if cache_key.is_a?(Enumerable)
+ cache_public = options.key?(:public) ? options.delete(:public) : true
content_type = options.delete(:content_type) || 'application/json'
data = Rails.cache.fetch(cache_key, { raw: true }.merge(options)) do
yield.to_json
end
- expires_in options[:expires_in], public: options[:public]
+ expires_in options[:expires_in], public: cache_public
render json: data, content_type: content_type
end