From ca69b6cdd7cb6315bafd9cb8f4af73aad13d5552 Mon Sep 17 00:00:00 2001 From: Akira Matsuda Date: Tue, 4 Oct 2016 11:23:48 +0900 Subject: [PATCH] Make sure that @output_buffer is at least ActiveSupport::SafeBuffer --- lib/kaminari/helpers/paginator.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/kaminari/helpers/paginator.rb b/lib/kaminari/helpers/paginator.rb index 6f49360..d22b85e 100644 --- a/lib/kaminari/helpers/paginator.rb +++ b/lib/kaminari/helpers/paginator.rb @@ -22,7 +22,13 @@ module Kaminari @last = nil #XXX Using parent template's buffer class for rendering each partial here. This might cause problems if the handler mismatches - buffer_class = defined?(::ActionView::OutputBuffer) ? ::ActionView::OutputBuffer : template.instance_variable_get(:@output_buffer).class + buffer_class = if defined?(::ActionView::OutputBuffer) + ::ActionView::OutputBuffer + elsif template.instance_variable_get(:@output_buffer) + template.instance_variable_get(:@output_buffer).class + else + ActiveSupport::SafeBuffer + end @output_buffer = buffer_class.new end