1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00

Tweak default_url_options deprecation warning

This commit is contained in:
Jeremy Kemper 2010-03-05 12:15:45 -08:00
parent a04b44910e
commit a82cf0a932

View file

@ -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
end