Permalink
Browse files

Merge commit 'mainstream/master'

  • Loading branch information...
2 parents 140a5c0 + be1beb1 commit 09597f7140b3614573481020c980afadb01e4eb8 @lifo lifo committed Nov 2, 2008
Showing with 4 additions and 6 deletions.
  1. +2 −5 actionpack/lib/action_controller/base.rb
  2. +2 −1 actionpack/lib/action_controller/request.rb
@@ -364,11 +364,8 @@ class Base
# 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>.
@@ -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)

0 comments on commit 09597f7

Please sign in to comment.