Permalink
Browse files

Revert "Move setting content_type to AV"

This reverts commit f4d602aff6cec80304b131ecfcc2676d0304f0cc.
  • Loading branch information...
1 parent e9f06b2 commit 839938e3deaa4b0f3c1f5e6b46e398a1a46ecf5b @lukaszx0 lukaszx0 committed Jul 25, 2013
@@ -12,6 +12,7 @@ def process_action(*) #:nodoc:
def render(*args) #:nodoc:
raise ::AbstractController::DoubleRenderError if response_body
super
+ self.content_type ||= Mime[lookup_context.rendered_format].to_s
response_body
end
@@ -38,7 +38,7 @@ class Railtie < Rails::Railtie # :nodoc:
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
@@ -82,8 +82,6 @@ def render(*args, &block)
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

0 comments on commit 839938e

Please sign in to comment.