aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/request.rb
diff options
context:
space:
mode:
authorMichael Koziarski <michael@koziarski.com>2008-11-02 13:12:48 +0100
committerMichael Koziarski <michael@koziarski.com>2008-11-02 13:12:48 +0100
commit8a53e258e541ede706a30ece80d89b3097efb686 (patch)
tree53d97f15c3cf5deeeeb18b35a4d35919840154f8 /actionpack/lib/action_controller/request.rb
parentb047929c14f088d535eea460ddd8769f43cd4ae5 (diff)
downloadrails-8a53e258e541ede706a30ece80d89b3097efb686.tar.gz
rails-8a53e258e541ede706a30ece80d89b3097efb686.tar.bz2
rails-8a53e258e541ede706a30ece80d89b3097efb686.zip
Backwards compatibility fixes for relative_url_root
* Make the old deprecated relative_url_root still set the value as it's still used by mongrel * Set the default from the ENV value when the file is required, not at runtime.
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)