diff options
author | Yehuda Katz <yehudakatz@YK.local> | 2010-02-18 12:26:16 -0800 |
---|---|---|
committer | Yehuda Katz <yehudakatz@YK.local> | 2010-02-18 14:04:26 -0800 |
commit | 8a1f057a26135f9b94717d72fff704843f56f521 (patch) | |
tree | e402c83a8b3364b37a3e50f486983689a819c6a8 /actionpack | |
parent | cc852e2580575b715134cce65d6b3dc8826fe918 (diff) | |
download | rails-8a1f057a26135f9b94717d72fff704843f56f521.tar.gz rails-8a1f057a26135f9b94717d72fff704843f56f521.tar.bz2 rails-8a1f057a26135f9b94717d72fff704843f56f521.zip |
Update Renderer
Diffstat (limited to 'actionpack')
-rw-r--r-- | actionpack/lib/action_controller/metal/rendering.rb | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/actionpack/lib/action_controller/metal/rendering.rb b/actionpack/lib/action_controller/metal/rendering.rb index 0bd362fd64..b1dab8497b 100644 --- a/actionpack/lib/action_controller/metal/rendering.rb +++ b/actionpack/lib/action_controller/metal/rendering.rb @@ -2,13 +2,12 @@ module ActionController module Rendering extend ActiveSupport::Concern - included do - include AbstractController::Rendering - include AbstractController::LocalizedCache - end + include RackDelegation + include AbstractController::Rendering + include AbstractController::LocalizedCache def process_action(*) - self.formats = request.formats.map {|x| x.to_sym} + self.formats = request.formats.map {|x| x.to_sym } super end |