Mailer#url_for not called in views with Rails 3.1.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9023 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/helpers/application_helper.rb

@@ -99,7 +99,7 @@ module ApplicationHelper
     action = options.delete(:download) ? 'download' : 'show'
     link_to(h(text),
            {:controller => 'attachments', :action => action,
-            :id => attachment, :filename => attachment.filename },
+            :id => attachment, :filename => attachment.filename }.merge(options),
            options)
   end