From bae691f61ab8cf4a59adaee6406855e11d009c74 Mon Sep 17 00:00:00 2001
From: Carlhuda <carlhuda@engineyard.com>
Date: Fri, 26 Feb 2010 15:20:41 -0800
Subject: Change the API for setting global options for #url_for to
 self.url_options = { ... }

	This attr_accessor can be set in a before filter or in the action itself.
    Overwriting default_url_options still works but will output a deprecation notice.
---
 actionpack/lib/action_controller/metal/url_for.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack/lib/action_controller/metal')

diff --git a/actionpack/lib/action_controller/metal/url_for.rb b/actionpack/lib/action_controller/metal/url_for.rb
index 6748cb7bd4..8a06f34d23 100644
--- a/actionpack/lib/action_controller/metal/url_for.rb
+++ b/actionpack/lib/action_controller/metal/url_for.rb
@@ -5,7 +5,7 @@ module ActionController
     include ActionDispatch::Routing::UrlFor
     include ActionController::RackDelegation
 
-    def merge_options(options)
+    def url_options
       super.reverse_merge(
         :host => request.host_with_port,
         :protocol => request.protocol,
-- 
cgit v1.2.3