aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/new_base/renderer.rb
diff options
context:
space:
mode:
authorYehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>2009-05-20 17:22:29 -0700
committerYehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>2009-05-20 17:22:29 -0700
commitc8eda9ade49700abce104de1ce7e8e1a754fc97e (patch)
tree03d20be229bf87eb5e854a3bea2e68068de4aac0 /actionpack/lib/action_controller/new_base/renderer.rb
parentc4a6109286909c394e8c5bfc471a1eb9de245d2b (diff)
downloadrails-c8eda9ade49700abce104de1ce7e8e1a754fc97e.tar.gz
rails-c8eda9ade49700abce104de1ce7e8e1a754fc97e.tar.bz2
rails-c8eda9ade49700abce104de1ce7e8e1a754fc97e.zip
Fixed new_base tests on ruby 1.9
Diffstat (limited to 'actionpack/lib/action_controller/new_base/renderer.rb')
-rw-r--r--actionpack/lib/action_controller/new_base/renderer.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/new_base/renderer.rb b/actionpack/lib/action_controller/new_base/renderer.rb
index 276816a6f5..6176212970 100644
--- a/actionpack/lib/action_controller/new_base/renderer.rb
+++ b/actionpack/lib/action_controller/new_base/renderer.rb
@@ -4,8 +4,8 @@ module ActionController
depends_on AbstractController::Renderer
- def initialize(*)
- self.formats = [:html]
+ def process_action(*)
+ self.formats = request.formats.map {|x| x.to_sym}
super
end