aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/request.rb
diff options
context:
space:
mode:
authorRyan Bigg <radarlistener@gmail.com>2008-11-12 21:45:51 +1030
committerRyan Bigg <radarlistener@gmail.com>2008-11-12 21:45:51 +1030
commit451969f57a6dfee8537fb10d179514e011559111 (patch)
tree1857b9fc07a56c06a9f97fe4de8dc4554fd8a489 /actionpack/lib/action_controller/request.rb
parent7f023b5e3bd62c1f91ee341c1af155c0953e693a (diff)
parentef3672dddaf6171b2fd9ef5ecc4458e0349a486f (diff)
downloadrails-451969f57a6dfee8537fb10d179514e011559111.tar.gz
rails-451969f57a6dfee8537fb10d179514e011559111.tar.bz2
rails-451969f57a6dfee8537fb10d179514e011559111.zip
Merge branch 'master' of git@github.com:lifo/docrails
Diffstat (limited to 'actionpack/lib/action_controller/request.rb')
-rwxr-xr-xactionpack/lib/action_controller/request.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/request.rb b/actionpack/lib/action_controller/request.rb
index 9f33cbc55f..a6d4abf029 100755
--- a/actionpack/lib/action_controller/request.rb
+++ b/actionpack/lib/action_controller/request.rb
@@ -9,10 +9,11 @@ module ActionController
class AbstractRequest
extend ActiveSupport::Memoizable
- def self.relative_url_root=(*args)
+ def self.relative_url_root=(relative_url_root)
ActiveSupport::Deprecation.warn(
"ActionController::AbstractRequest.relative_url_root= has been renamed." +
"You can now set it with config.action_controller.relative_url_root=", caller)
+ ActionController::base.relative_url_root=relative_url_root
end
HTTP_METHODS = %w(get head put post delete options)