diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-07-16 17:15:40 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-07-16 17:15:40 +0000 |
| commit | 537be80be26c38d5384d588873d2682fd908ee62 (patch) | |
| tree | 0f4a60940759a5ad8d86bebcd17b36649b02dfc8 /app/controllers/attachments_controller.rb | |
| parent | 5c2de4dfc95293a7965ff8cf980a310922fc4c05 (diff) | |
| download | redmine-537be80be26c38d5384d588873d2682fd908ee62.tar.gz redmine-537be80be26c38d5384d588873d2682fd908ee62.zip | |
Adds a macro for inserting thumbnails in formatted text (#3510).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10013 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers/attachments_controller.rb')
| -rw-r--r-- | app/controllers/attachments_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb index edae9b0cc..74a11a1c7 100644 --- a/app/controllers/attachments_controller.rb +++ b/app/controllers/attachments_controller.rb @@ -61,7 +61,7 @@ class AttachmentsController < ApplicationController end def thumbnail - if @attachment.thumbnailable? && Setting.thumbnails_enabled? && thumbnail = @attachment.thumbnail + if @attachment.thumbnailable? && thumbnail = @attachment.thumbnail(:size => params[:size]) if stale?(:etag => thumbnail) send_file thumbnail, :filename => filename_for_content_disposition(@attachment.filename), |