aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/metal/rendering.rb
diff options
context:
space:
mode:
authorYehuda Katz <yehudakatz@YK.local>2010-02-18 12:26:16 -0800
committerYehuda Katz <yehudakatz@YK.local>2010-02-18 14:04:26 -0800
commit8a1f057a26135f9b94717d72fff704843f56f521 (patch)
treee402c83a8b3364b37a3e50f486983689a819c6a8 /actionpack/lib/action_controller/metal/rendering.rb
parentcc852e2580575b715134cce65d6b3dc8826fe918 (diff)
downloadrails-8a1f057a26135f9b94717d72fff704843f56f521.tar.gz
rails-8a1f057a26135f9b94717d72fff704843f56f521.tar.bz2
rails-8a1f057a26135f9b94717d72fff704843f56f521.zip
Update Renderer
Diffstat (limited to 'actionpack/lib/action_controller/metal/rendering.rb')
-rw-r--r--actionpack/lib/action_controller/metal/rendering.rb9
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