aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2010-03-05 12:15:45 -0800
committerJeremy Kemper <jeremy@bitsweat.net>2010-03-05 12:17:23 -0800
commita82cf0a9327d85f5787427e1d06d0ae374b11103 (patch)
tree894a5bc066e3c675a3cedfed216faee75a07b4e3
parenta04b44910e57387bd1bcfbd95c3a6754a08e77af (diff)
downloadrails-a82cf0a9327d85f5787427e1d06d0ae374b11103.tar.gz
rails-a82cf0a9327d85f5787427e1d06d0ae374b11103.tar.bz2
rails-a82cf0a9327d85f5787427e1d06d0ae374b11103.zip
Tweak default_url_options deprecation warning
-rw-r--r--actionpack/lib/action_dispatch/routing/url_for.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/routing/url_for.rb b/actionpack/lib/action_dispatch/routing/url_for.rb
index be5edcc120..0ab20dcb39 100644
--- a/actionpack/lib/action_dispatch/routing/url_for.rb
+++ b/actionpack/lib/action_dispatch/routing/url_for.rb
@@ -152,7 +152,7 @@ module ActionDispatch
when Hash
# Handle the deprecated instance level default_url_options
if respond_to?(:default_url_options, true)
- ActiveSupport::Deprecation.warn "Overwriting #default_url_options is deprecated. Please set url options with self.url_options = { ... }"
+ ActiveSupport::Deprecation.warn "Overriding the #default_url_options method is deprecated. Instead, set self.url_options = { ... } in a before_filter."
if defaults = default_url_options(options)
options = defaults.merge(options)
end
@@ -165,4 +165,4 @@ module ActionDispatch
end
end
end
-end \ No newline at end of file
+end