Fixed incorrect icon file name for .doc files (issue 200)

diff --git a/releases.moxie b/releases.moxie
index b4a6021fe5610c9b87cca9bb06aace736fd54064..3667326d801da842e20ca420fed9784fbdfac11d 100644 (file)
--- a/releases.moxie
+++ b/releases.moxie
@@ -9,6 +9,7 @@ r17: {
      - Could not reset settings with $ or { characters through Gitblit Manager because they are not properly escaped\r
         - Fix NPE when getting user's fork without repository list caching (issue 182)\r
         - Fix internal error on folder history links (issue 192)\r
+        - Fixed incorrect icon file name for .doc files (issue 200)\r
 \r
     additions: \r
         - Option to force client-side basic authentication instead of form-based authentication if web.authenticateViewPages=true (issue 222)\r
@@ -22,6 +23,7 @@ r17: {
     contributors:\r
        - Christian Aistleitner\r
        - Jay Meyer\r
+       - Slawomir Bochenski\r
        - github/furinzen\r
     - github/mschaefers\r
     - github/thefake\r

diff --git a/src/main/java/com/gitblit/wicket/WicketUtils.java b/src/main/java/com/gitblit/wicket/WicketUtils.java
index e4eb29fb7d23d199bf48e4cc76d765c29ea68769..6e03032e7edbbe11f25c30281d270a4186919595 100644 (file)
--- a/src/main/java/com/gitblit/wicket/WicketUtils.java
+++ b/src/main/java/com/gitblit/wicket/WicketUtils.java
@@ -165,7 +165,7 @@ public class WicketUtils {
                                || filename.endsWith(".xlsx")) {\r
                        return newImage(wicketId, "file_excel_16x16.png");\r
                } else if (filename.endsWith(".doc") || filename.endsWith(".docx")) {\r
-                       return newImage(wicketId, "file_word_16x16.png");\r
+                       return newImage(wicketId, "file_doc_16x16.png");\r
                } else if (filename.endsWith(".ppt")) {\r
                        return newImage(wicketId, "file_ppt_16x16.png");\r
                } else if (filename.endsWith(".zip")) {\r