From cb2d671cb884a7cfeb991ce5af5d7e1047685dbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Strza=C5=82kowski?= Date: Tue, 23 Jul 2013 18:50:22 +0200 Subject: Move setting content_type to AV --- actionview/lib/action_view/railtie.rb | 2 +- actionview/lib/action_view/rendering.rb | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'actionview/lib') diff --git a/actionview/lib/action_view/railtie.rb b/actionview/lib/action_view/railtie.rb index 8382023e06..441bdccd84 100644 --- a/actionview/lib/action_view/railtie.rb +++ b/actionview/lib/action_view/railtie.rb @@ -38,7 +38,7 @@ module ActionView initializer "action_view.setup_action_pack", before: :add_view_paths do |app| ActiveSupport.on_load(:action_controller) do - ActionController::Base.superclass.send(:include, ActionView::Layouts) + #ActionController::Base.superclass.send(:include, ActionView::Layouts) end end diff --git a/actionview/lib/action_view/rendering.rb b/actionview/lib/action_view/rendering.rb index e3d0beade3..0db469766c 100644 --- a/actionview/lib/action_view/rendering.rb +++ b/actionview/lib/action_view/rendering.rb @@ -82,6 +82,8 @@ module ActionView super(*args, &block) options = _normalize_render(*args, &block) + + self.content_type ||= Mime[lookup_context.rendered_format].to_s self.response_body = render_to_body(options) end -- cgit v1.2.3