aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2012-03-06 17:52:54 -0200
committerSantiago Pastorino <santiago@wyeworks.com>2012-03-06 17:52:54 -0200
commitb90d24b00e88257e10be30a8831b13d6a7de27d5 (patch)
tree8d026fcde45792bd1eb56739cfa1785b4104f13b /actionpack
parent7c90d91c3c43bdbba25d38589aed0e2940af3bc8 (diff)
downloadrails-b90d24b00e88257e10be30a8831b13d6a7de27d5.tar.gz
rails-b90d24b00e88257e10be30a8831b13d6a7de27d5.tar.bz2
rails-b90d24b00e88257e10be30a8831b13d6a7de27d5.zip
Avoid ImplicitRender just call render directly
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_controller/metal/mime_responds.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/metal/mime_responds.rb b/actionpack/lib/action_controller/metal/mime_responds.rb
index b423807f91..c8a37c5975 100644
--- a/actionpack/lib/action_controller/metal/mime_responds.rb
+++ b/actionpack/lib/action_controller/metal/mime_responds.rb
@@ -6,8 +6,6 @@ module ActionController #:nodoc:
module MimeResponds
extend ActiveSupport::Concern
- include ActionController::ImplicitRender
-
included do
class_attribute :responder, :mimes_for_respond_to
self.responder = ActionController::Responder
@@ -193,7 +191,7 @@ module ActionController #:nodoc:
if collector = retrieve_collector_from_mimes(mimes, &block)
response = collector.response
- response ? response.call : default_render({})
+ response ? response.call : render({})
end
end