From 839938e3deaa4b0f3c1f5e6b46e398a1a46ecf5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Strza=C5=82kowski?= Date: Thu, 25 Jul 2013 14:04:52 +0200 Subject: Revert "Move setting content_type to AV" This reverts commit f4d602aff6cec80304b131ecfcc2676d0304f0cc. --- actionpack/lib/action_controller/metal/rendering.rb | 1 + actionview/lib/action_view/railtie.rb | 2 +- actionview/lib/action_view/rendering.rb | 2 -- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/actionpack/lib/action_controller/metal/rendering.rb b/actionpack/lib/action_controller/metal/rendering.rb index cdc63d67a3..f0e8945f11 100644 --- a/actionpack/lib/action_controller/metal/rendering.rb +++ b/actionpack/lib/action_controller/metal/rendering.rb @@ -12,6 +12,7 @@ module ActionController def render(*args) #:nodoc: raise ::AbstractController::DoubleRenderError if response_body super + self.content_type ||= Mime[lookup_context.rendered_format].to_s response_body end diff --git a/actionview/lib/action_view/railtie.rb b/actionview/lib/action_view/railtie.rb index 441bdccd84..8382023e06 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 0db469766c..e3d0beade3 100644 --- a/actionview/lib/action_view/rendering.rb +++ b/actionview/lib/action_view/rendering.rb @@ -82,8 +82,6 @@ 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