From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 16 Jul 2017 11:49:22 +0000 (+0000)
Subject: Merged r16813 (#26379).
X-Git-Tag: 3.4.2~4
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=742440e0385956a94079cfa5ec22f7f0e6cfcd73;p=redmine.git

Merged r16813 (#26379).

git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16819 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 52a405211..3409bb7be 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -220,11 +220,12 @@ module ApplicationHelper
   end
 
   def thumbnail_tag(attachment)
+    thumbnail_size = Setting.thumbnails_size.to_i
     link_to(
       image_tag(
         thumbnail_path(attachment),
-        :srcset => "#{thumbnail_path(attachment, :size => Setting.thumbnails_size.to_i * 2)} 2x",
-        :width => Setting.thumbnails_size
+        :srcset => "#{thumbnail_path(attachment, :size => thumbnail_size * 2)} 2x",
+        :style => "max-width: #{thumbnail_size}px; max-height: #{thumbnail_size}px;"
       ),
       named_attachment_path(
         attachment,