diff options
| author | Michael Koziarski <michael@koziarski.com> | 2008-11-02 13:12:48 +0100 |
|---|---|---|
| committer | Michael Koziarski <michael@koziarski.com> | 2008-11-02 13:12:48 +0100 |
| commit | 8a53e258e541ede706a30ece80d89b3097efb686 (patch) | |
| tree | 53d97f15c3cf5deeeeb18b35a4d35919840154f8 /actionpack/lib/action_controller/base.rb | |
| parent | b047929c14f088d535eea460ddd8769f43cd4ae5 (diff) | |
| download | rails-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/base.rb')
| -rw-r--r-- | actionpack/lib/action_controller/base.rb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index cf86c5eed0..0cf74cd53e 100644 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -364,11 +364,8 @@ module ActionController #:nodoc: # If you are deploying to a subdirectory, you will need to set # <tt>config.action_controller.relative_url_root</tt> # This defaults to ENV['RAILS_RELATIVE_URL_ROOT'] - cattr_writer :relative_url_root - - def self.relative_url_root - @@relative_url_root || ENV['RAILS_RELATIVE_URL_ROOT'] - end + cattr_accessor :relative_url_root + self.relative_url_root = ENV['RAILS_RELATIVE_URL_ROOT'] # Holds the request object that's primarily used to get environment variables through access like # <tt>request.env["REQUEST_URI"]</tt>. |