aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/base.rb
diff options
context:
space:
mode:
authorTobias Lütke <tobias.luetke@gmail.com>2007-09-06 14:28:32 +0000
committerTobias Lütke <tobias.luetke@gmail.com>2007-09-06 14:28:32 +0000
commit68d685056a6a8a6fcb7f922c161d26a54c770213 (patch)
treeafcb67a455a6b9fba6434ae9c0f74cfc74e47433 /actionpack/lib/action_controller/base.rb
parent0e6c8e5f6c168b9d376122f730c604d3758f4b04 (diff)
downloadrails-68d685056a6a8a6fcb7f922c161d26a54c770213.tar.gz
rails-68d685056a6a8a6fcb7f922c161d26a54c770213.tar.bz2
rails-68d685056a6a8a6fcb7f922c161d26a54c770213.zip
Remove deprecated named routes [pixeltrix]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7415 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/base.rb')
-rwxr-xr-xactionpack/lib/action_controller/base.rb8
1 files changed, 6 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index e0474ff5b3..81db0ed467 100755
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -310,6 +310,10 @@ module ActionController #:nodoc:
# Turn on +ignore_missing_templates+ if you want to unit test actions without making the associated templates.
cattr_accessor :ignore_missing_templates
+ # Controls the resource action separator
+ @@resource_action_separator = "/"
+ cattr_accessor :resource_action_separator
+
# Holds the request object that's primarily used to get environment variables through access like
# <tt>request.env["REQUEST_URI"]</tt>.
attr_internal :request
@@ -605,11 +609,11 @@ module ActionController #:nodoc:
def controller_path
self.class.controller_path
end
-
+
def session_enabled?
request.session_options && request.session_options[:disabled] != false
end
-
+
# View load paths for controller.
def view_paths
self.class.view_paths