diff options
| author | Cheah Chu Yeow <chuyeow@gmail.com> | 2008-06-23 20:51:38 +0800 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-07-09 13:02:14 +0100 |
| commit | 96708af6a58a48c2324a3bf8d34232bc29b398c9 (patch) | |
| tree | 48a7259154f5349d57ee73b06fadcd1dd25aaf91 /actionpack/lib/action_view | |
| parent | 2b4eb586efa240dd985d8b5fe918084ab17fae2b (diff) | |
| download | rails-96708af6a58a48c2324a3bf8d34232bc29b398c9.tar.gz rails-96708af6a58a48c2324a3bf8d34232bc29b398c9.tar.bz2 rails-96708af6a58a48c2324a3bf8d34232bc29b398c9.zip | |
Ensure url_for(nil) falls back to url_for({}). [#472 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
Diffstat (limited to 'actionpack/lib/action_view')
| -rw-r--r-- | actionpack/lib/action_view/helpers/url_helper.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/actionpack/lib/action_view/helpers/url_helper.rb b/actionpack/lib/action_view/helpers/url_helper.rb index d5b7255642..f6a1f271f0 100644 --- a/actionpack/lib/action_view/helpers/url_helper.rb +++ b/actionpack/lib/action_view/helpers/url_helper.rb @@ -63,17 +63,15 @@ module ActionView # # calls @workshop.to_s # # => /workshops/5 def url_for(options = {}) + options ||= {} case options when Hash - show_path = options[:host].nil? ? true : false - options = { :only_path => show_path }.update(options.symbolize_keys) + options = { :only_path => options[:host].nil? }.update(options.symbolize_keys) escape = options.key?(:escape) ? options.delete(:escape) : true url = @controller.send(:url_for, options) when String escape = true url = options - when NilClass - url = @controller.send(:url_for, nil) else escape = false url = polymorphic_path(options) |