diff options
| author | José Valim <jose.valim@gmail.com> | 2012-02-04 16:00:02 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-02-04 16:01:01 +0100 |
| commit | 2bf2055f7a856af0da17473e55ad2bcc5c69b02a (patch) | |
| tree | db84cdea8960b08952bfa21afc98f4d508fea720 /actionpack/lib/action_controller/metal/responder.rb | |
| parent | 44b9992c1179558fb9cd9b4c3524f3ab6d52daf9 (diff) | |
| download | rails-2bf2055f7a856af0da17473e55ad2bcc5c69b02a.tar.gz rails-2bf2055f7a856af0da17473e55ad2bcc5c69b02a.tar.bz2 rails-2bf2055f7a856af0da17473e55ad2bcc5c69b02a.zip | |
Clean up a bit default_response handling and cache format negotiation.
Diffstat (limited to 'actionpack/lib/action_controller/metal/responder.rb')
| -rw-r--r-- | actionpack/lib/action_controller/metal/responder.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/metal/responder.rb b/actionpack/lib/action_controller/metal/responder.rb index 9500a349cb..4ad64bff20 100644 --- a/actionpack/lib/action_controller/metal/responder.rb +++ b/actionpack/lib/action_controller/metal/responder.rb @@ -129,7 +129,6 @@ module ActionController #:nodoc: @resources = resources @options = options @action = options.delete(:action) - @default_response = options.delete(:default_response) end delegate :head, :render, :redirect_to, :to => :controller @@ -226,7 +225,7 @@ module ActionController #:nodoc: # controller. # def default_render - @default_response.call(options) + controller.default_render(options) end # Display is just a shortcut to render a resource with the current format. |