aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/base/mime_responds.rb
diff options
context:
space:
mode:
authorYehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>2009-06-17 16:14:05 -0700
committerYehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>2009-06-17 16:14:05 -0700
commit8fdf3d7890d2e58508e028c93d3797f21a774dbc (patch)
tree4eff185e19bd63161ad15fb47120f53e93debcf5 /actionpack/lib/action_controller/base/mime_responds.rb
parent251a6e492c72d8aea713b7dabd245d68301e455d (diff)
downloadrails-8fdf3d7890d2e58508e028c93d3797f21a774dbc.tar.gz
rails-8fdf3d7890d2e58508e028c93d3797f21a774dbc.tar.bz2
rails-8fdf3d7890d2e58508e028c93d3797f21a774dbc.zip
Remove some defined?(Http) checks
Diffstat (limited to 'actionpack/lib/action_controller/base/mime_responds.rb')
-rw-r--r--actionpack/lib/action_controller/base/mime_responds.rb5
1 files changed, 1 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/base/mime_responds.rb b/actionpack/lib/action_controller/base/mime_responds.rb
index c0aa58a6c2..ed0d58dba1 100644
--- a/actionpack/lib/action_controller/base/mime_responds.rb
+++ b/actionpack/lib/action_controller/base/mime_responds.rb
@@ -120,10 +120,7 @@ module ActionController #:nodoc:
@responses[mime_type] ||= Proc.new do
# TODO: Remove this when new base is merged in
- if defined?(Http)
- @controller.formats = [mime_type.to_sym]
- end
-
+ @controller.formats = [mime_type.to_sym]
@controller.content_type = mime_type
@controller.template.formats = [mime_type.to_sym]