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
2012-07-16 17:15:40 +00:00
parent 5c2de4dfc9
commit 537be80be2
7 changed files with 79 additions and 28 deletions
@@ -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),