From 9efe01ef0d332239f37a211e2351f107de5d235b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Sun, 8 Apr 2012 23:42:02 -0300
Subject: default_url_options does not receive one argument anymore

---
 guides/source/action_controller_overview.textile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'guides/source/action_controller_overview.textile')

diff --git a/guides/source/action_controller_overview.textile b/guides/source/action_controller_overview.textile
index 52d134ace5..d6f39c486d 100644
--- a/guides/source/action_controller_overview.textile
+++ b/guides/source/action_controller_overview.textile
@@ -152,8 +152,7 @@ You can set global default parameters that will be used when generating URLs wit
 
 <ruby>
 class ApplicationController < ActionController::Base
-  # The options parameter is the hash passed in to 'url_for'
-  def default_url_options(options)
+  def default_url_options
     {:locale => I18n.locale}
   end
 end
-- 
cgit v1.2.3


From c9945b3f0a85949f8b9fa1218a868a988e6c4fa6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Sun, 8 Apr 2012 23:44:26 -0300
Subject: Document that default_url_options must return a hash with symbolized
 keys

---
 guides/source/action_controller_overview.textile | 1 +
 1 file changed, 1 insertion(+)

(limited to 'guides/source/action_controller_overview.textile')

diff --git a/guides/source/action_controller_overview.textile b/guides/source/action_controller_overview.textile
index d6f39c486d..a76a116103 100644
--- a/guides/source/action_controller_overview.textile
+++ b/guides/source/action_controller_overview.textile
@@ -152,6 +152,7 @@ You can set global default parameters that will be used when generating URLs wit
 
 <ruby>
 class ApplicationController < ActionController::Base
+  # This method must return a hash with symbolized keys.
   def default_url_options
     {:locale => I18n.locale}
   end
-- 
cgit v1.2.3

