aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/metal/compatibility.rb
diff options
context:
space:
mode:
authorCarl Lerche <carllerche@mac.com>2010-03-03 09:41:23 -0800
committerCarl Lerche <carllerche@mac.com>2010-03-03 21:24:00 -0800
commit902d5a4f05c879674a3d010ac8ca76902308e18e (patch)
tree874d88ee59de07cf8a5483257889c2c522d312a9 /actionpack/lib/action_controller/metal/compatibility.rb
parent18bcce596efaa4e77a202431ab5e736001a394c6 (diff)
downloadrails-902d5a4f05c879674a3d010ac8ca76902308e18e.tar.gz
rails-902d5a4f05c879674a3d010ac8ca76902308e18e.tar.bz2
rails-902d5a4f05c879674a3d010ac8ca76902308e18e.zip
Indicate that ActionController::Base.resource_action_separator is deprecated and only has an effect with the deprecated router DSL.
Diffstat (limited to 'actionpack/lib/action_controller/metal/compatibility.rb')
-rw-r--r--actionpack/lib/action_controller/metal/compatibility.rb11
1 files changed, 9 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/metal/compatibility.rb b/actionpack/lib/action_controller/metal/compatibility.rb
index d6d8d612a3..1a4d0349fe 100644
--- a/actionpack/lib/action_controller/metal/compatibility.rb
+++ b/actionpack/lib/action_controller/metal/compatibility.rb
@@ -32,8 +32,15 @@ module ActionController
@_response)
# Controls the resource action separator
- cattr_accessor :resource_action_separator
- self.resource_action_separator = "/"
+ def self.resource_action_separator
+ @resource_action_separator ||= "/"
+ end
+
+ def self.resource_action_separator=(val)
+ ActiveSupport::Deprecation.warn "ActionController::Base.resource_action_separator is deprecated and only " \
+ "works with the deprecated router DSL."
+ @resource_action_separator = val
+ end
def self.use_accept_header
ActiveSupport::Deprecation.warn "ActionController::Base.use_accept_header doesn't do anything anymore. " \