aboutsummaryrefslogtreecommitdiffstats
path: root/guides/source
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2012-04-08 20:10:14 -0700
committerSantiago Pastorino <santiago@wyeworks.com>2012-04-08 20:10:14 -0700
commit4c1dcb05373f667be90a69bfb2b642efe75e9d18 (patch)
treee0a57a91ae750babcc503184c9dfdad052ca7596 /guides/source
parent500c9a161c10e95b8d3c8a63a57da673ddf3da3c (diff)
parentc9945b3f0a85949f8b9fa1218a868a988e6c4fa6 (diff)
downloadrails-4c1dcb05373f667be90a69bfb2b642efe75e9d18.tar.gz
rails-4c1dcb05373f667be90a69bfb2b642efe75e9d18.tar.bz2
rails-4c1dcb05373f667be90a69bfb2b642efe75e9d18.zip
Merge pull request #5783 from rafaelfranca/default_url_options
Document that default_url_options must return a hash with symbolized keys
Diffstat (limited to 'guides/source')
-rw-r--r--guides/source/action_controller_overview.textile4
1 files changed, 2 insertions, 2 deletions
diff --git a/guides/source/action_controller_overview.textile b/guides/source/action_controller_overview.textile
index 52d134ace5..a76a116103 100644
--- a/guides/source/action_controller_overview.textile
+++ b/guides/source/action_controller_overview.textile
@@ -152,8 +152,8 @@ 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)
+ # This method must return a hash with symbolized keys.
+ def default_url_options
{:locale => I18n.locale}
end
end