aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorCarl Lerche <carllerche@mac.com>2010-03-03 09:32:27 -0800
committerCarl Lerche <carllerche@mac.com>2010-03-03 21:24:00 -0800
commit18bcce596efaa4e77a202431ab5e736001a394c6 (patch)
tree890130c084d463539442745ad6ea89d4f05f7c6f /actionpack/lib
parentfb14b8c6fddae818b2688ac1e584534390c37f72 (diff)
downloadrails-18bcce596efaa4e77a202431ab5e736001a394c6.tar.gz
rails-18bcce596efaa4e77a202431ab5e736001a394c6.tar.bz2
rails-18bcce596efaa4e77a202431ab5e736001a394c6.zip
ActionController::Base.use_accept_header is not actually used anymore, so let's deprecate it.
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_controller/metal/compatibility.rb10
1 files changed, 8 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/metal/compatibility.rb b/actionpack/lib/action_controller/metal/compatibility.rb
index 93f7b8ca49..d6d8d612a3 100644
--- a/actionpack/lib/action_controller/metal/compatibility.rb
+++ b/actionpack/lib/action_controller/metal/compatibility.rb
@@ -35,8 +35,14 @@ module ActionController
cattr_accessor :resource_action_separator
self.resource_action_separator = "/"
- cattr_accessor :use_accept_header
- self.use_accept_header = true
+ def self.use_accept_header
+ ActiveSupport::Deprecation.warn "ActionController::Base.use_accept_header doesn't do anything anymore. " \
+ "The accept header is always taken into account."
+ end
+
+ def self.use_accept_header=(val)
+ use_accept_header
+ end
self.page_cache_directory = defined?(Rails.public_path) ? Rails.public_path : ""