ActionController::Base.relative_url_root falls back to ENV['RAILS_REL…

…ATIVE_URL_ROOT']
rails · Jul 24, 2008 · f48b9ab · f48b9ab
1 parent 11fdcf8
commit f48b9ab
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
@@ -356,7 +356,12 @@ class Base
 
     # If you are deploying to a subdirectory, you will need to set
     # <tt>config.action_controller.relative_url_root</tt>
-    class_inheritable_accessor :relative_url_root
+    # 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
 
     # Holds the request object that's primarily used to get environment variables through access like
     # <tt>request.env["REQUEST_URI"]</tt>.