Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Move setting content_type to AV

  • Loading branch information...
commit cb2d671cb884a7cfeb991ce5af5d7e1047685dbd 1 parent 0b4507a
@strzalek strzalek authored
View
1  actionpack/lib/action_controller/metal/rendering.rb
@@ -12,7 +12,6 @@ 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
View
2  actionview/lib/action_view/railtie.rb
@@ -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
View
2  actionview/lib/action_view/rendering.rb
@@ -82,6 +82,8 @@ 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
Please sign in to comment.
Something went wrong with that request. Please try again.