From 93d13c8867df8392b7bd0a1c162230089ed6b064 Mon Sep 17 00:00:00 2001
From: yanxd <sxty32@hotmail.com>
Date: Fri, 13 Jun 2014 15:42:59 +0800
Subject: [PATCH] =?UTF-8?q?system=20bin,=20=E5=9D=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/application_helper.rb     | 5 ++---
 app/views/attachments/_links.html.erb | 2 +-
 config/configuration.yml              | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 1623e00e3..e62339249 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -193,9 +193,8 @@ module ApplicationHelper
   end
 
   def thumbnail_tag(attachment)
-    imagepath = named_attachment_path(attachment, attachment.filename)
-    link_to image_tag(imagepath),
-            imagepath ,
+    link_to image_tag(thumbnail_path(attachment)),
+      named_attachment_path(attachment, attachment.filename),
       :title => attachment.filename
   end
 
diff --git a/app/views/attachments/_links.html.erb b/app/views/attachments/_links.html.erb
index f73df8fb4..c135ee214 100644
--- a/app/views/attachments/_links.html.erb
+++ b/app/views/attachments/_links.html.erb
@@ -33,7 +33,7 @@
   <% if images.any? %>
   <div class="thumbnails">
     <% images.each do |attachment| %>
-      <div><%= thumbnail_small_tag(attachment) %></div>
+      <div><%= thumbnail_tag(attachment) %></div>
     <% end %>
   </div>
   <% end %>
diff --git a/config/configuration.yml b/config/configuration.yml
index e7138b587..a98ea3391 100644
--- a/config/configuration.yml
+++ b/config/configuration.yml
@@ -173,7 +173,7 @@ default:
 
   # Absolute path (e.g. /usr/bin/convert, c:/im/convert.exe) to
   # the ImageMagick's `convert` binary. Used to generate attachment thumbnails.
-  imagemagick_convert_command: '/home/pdl/redmine-2.3.1-1/common/bin/convert'
+  imagemagick_convert_command: '/home/pdl/redmine-2.3.2-0/common/bin/convert'
 
   # Configuration of RMagcik font.
   #