# HG changeset patch # User Chris Cannam # Date 1350398223 -3600 # Node ID 910830dc222a956f65ad6c9bea7552c15c126b5a # Parent fa2a1b6cda26d4824ed436303bed98c148b3079d# Parent 35782bf2eb588cc1dfd8a62b2df22aadca38c172 Merge from branch "bug_521" diff -r fa2a1b6cda26 -r 910830dc222a app/controllers/attachments_controller.rb --- a/app/controllers/attachments_controller.rb Tue Oct 16 15:25:22 2012 +0100 +++ b/app/controllers/attachments_controller.rb Tue Oct 16 15:37:03 2012 +0100 @@ -49,9 +49,9 @@ end def download - if @attachment.container.is_a?(Version) || @attachment.container.is_a?(Project) - @attachment.increment_download - end + # cc: formerly this happened only if "@attachment.container.is_a?(Version)" + # or Project. Not good for us, we want to tally all downloads + @attachment.increment_download # images are sent inline send_file @attachment.diskfile, :filename => filename_for_content_disposition(@attachment.filename),