diff options
| author | Xavier Noria <fxn@hashref.com> | 2012-04-05 08:55:19 -0700 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2012-04-05 08:55:19 -0700 |
| commit | 7ecd6a731bd60665bc6de94095137f0b2c4ada2a (patch) | |
| tree | 4ccaa61ebeb7851d67178cc02aad8be6ac59c993 | |
| parent | 91cb99e9e4ef1b543cf60c2e56cf3ea865a2ac76 (diff) | |
| parent | f58ff6147311c1ce62d02a9d03f4f451281e49db (diff) | |
| download | rails-7ecd6a731bd60665bc6de94095137f0b2c4ada2a.tar.gz rails-7ecd6a731bd60665bc6de94095137f0b2c4ada2a.tar.bz2 rails-7ecd6a731bd60665bc6de94095137f0b2c4ada2a.zip | |
Merge pull request #5707 from morgoth/remove-unnecessary-block-in-fetch
removed unnecessary block when using fetch
| -rw-r--r-- | actionpack/lib/action_view/helpers/atom_feed_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/atom_feed_helper.rb b/actionpack/lib/action_view/helpers/atom_feed_helper.rb index 70164217de..f9aa8d7cee 100644 --- a/actionpack/lib/action_view/helpers/atom_feed_helper.rb +++ b/actionpack/lib/action_view/helpers/atom_feed_helper.rb @@ -189,7 +189,7 @@ module ActionView @xml.updated((options[:updated] || record.updated_at).xmlschema) end - type = options.fetch(:type) { 'text/html' } + type = options.fetch(:type, 'text/html') @xml.link(:rel => 'alternate', :type => type, :href => options[:url] || @view.polymorphic_url(record)) |