diff options
| author | José Valim <jose.valim@gmail.com> | 2010-03-10 22:17:44 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-03-10 22:17:44 +0100 |
| commit | 84f6da45a19d335be320991cab44f492f61dc5c7 (patch) | |
| tree | fcae699ac5cccf109ecc26d42bdbc039405f4501 /actionpack/lib/action_dispatch/routing/url_for.rb | |
| parent | 07cf49aadf3195db6ddefc58932efc88a6704a09 (diff) | |
| parent | 181c414baa877d748671d03fb09499c10f81ec02 (diff) | |
| download | rails-84f6da45a19d335be320991cab44f492f61dc5c7.tar.gz rails-84f6da45a19d335be320991cab44f492f61dc5c7.tar.bz2 rails-84f6da45a19d335be320991cab44f492f61dc5c7.zip | |
Merge branch 'master' of gitproxy:rails/rails
Diffstat (limited to 'actionpack/lib/action_dispatch/routing/url_for.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/url_for.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/actionpack/lib/action_dispatch/routing/url_for.rb b/actionpack/lib/action_dispatch/routing/url_for.rb index 4629e7e002..ec78f53fa6 100644 --- a/actionpack/lib/action_dispatch/routing/url_for.rb +++ b/actionpack/lib/action_dispatch/routing/url_for.rb @@ -113,8 +113,6 @@ module ActionDispatch # provided either explicitly, or via +default_url_options+. # * <tt>:port</tt> - Optionally specify the port to connect to. # * <tt>:anchor</tt> - An anchor name to be appended to the path. - # * <tt>:skip_relative_url_root</tt> - If true, the url is not constructed using the - # +relative_url_root+ set in ActionController::Base.relative_url_root. # * <tt>:trailing_slash</tt> - If true, adds a trailing slash, as in "/archive/2009/" # # Any other key (<tt>:controller</tt>, <tt>:action</tt>, etc.) given to @@ -131,7 +129,7 @@ module ActionDispatch when String options when nil, Hash - ActionController::UrlRewriter.rewrite(_router, url_options.merge(options || {})) + _router.url_for(url_options.merge(options || {})) else polymorphic_url(options) end |