From c3ce01edd08c54baf414990ac2c72ecefac9361f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Suttor?= <bsuttor@cirb.irisnet.be>
Date: Wed, 13 Nov 2013 15:53:12 +0100
Subject: [PATCH] Use defaultUser.png instead of defaultUser.gif

Indeed, defaultUser.gif is in a deprecated skins folder (Products/CMFPlone/
skins/plone_deprecated/defaultUser.gif) and not defaultUser.png
(Products/CMFPlone/skins/plone_images/defaultUser.png).
Test is also updated.
---
 CHANGES.rst                                         | 3 +++
 plone/app/discussion/browser/comments.pt            | 4 ++--
 plone/app/discussion/browser/comments.py            | 2 +-
 plone/app/discussion/tests/test_comments_viewlet.py | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index a5df199..42b7ac9 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,6 +4,9 @@ Changelog
 2.3.0 (unreleased)
 ------------------
 
+- Put defaultUser.png instead of old defaultUser.gif 
+  [bsuttor]
+
 - Remove bbb directory. bbb was never really implemented.
   [timo]
 
diff --git a/plone/app/discussion/browser/comments.pt b/plone/app/discussion/browser/comments.pt
index c192e7a..4e32e99 100644
--- a/plone/app/discussion/browser/comments.pt
+++ b/plone/app/discussion/browser/comments.pt
@@ -42,14 +42,14 @@
                 <div class="commentImage" tal:condition="showCommenterImage">
                     <a href="" tal:condition="has_author_link"
                                tal:attributes="href author_home_url">
-                         <img src="defaultUser.gif"
+                         <img src="defaultUser.png"
                               alt=""
                               class="defaultuserimg"
                               height="32"
                               tal:attributes="src portrait_url;
                                               alt reply/author_name" />
                     </a>
-                    <img src="defaultUser.gif"
+                    <img src="defaultUser.png"
                          alt=""
                          class="defaultuserimg"
                          height="32"
diff --git a/plone/app/discussion/browser/comments.py b/plone/app/discussion/browser/comments.py
index 87608c3..caf2859 100644
--- a/plone/app/discussion/browser/comments.py
+++ b/plone/app/discussion/browser/comments.py
@@ -411,7 +411,7 @@ class CommentsViewlet(ViewletBase):
 
         if username is None:
             # return the default user image if no username is given
-            return 'defaultUser.gif'
+            return 'defaultUser.png'
         else:
             portal_membership = getToolByName(self.context,
                                               'portal_membership',
diff --git a/plone/app/discussion/tests/test_comments_viewlet.py b/plone/app/discussion/tests/test_comments_viewlet.py
index f4a3d1e..aebeecd 100644
--- a/plone/app/discussion/tests/test_comments_viewlet.py
+++ b/plone/app/discussion/tests/test_comments_viewlet.py
@@ -479,7 +479,7 @@ class TestCommentsViewlet(unittest.TestCase):
     def test_get_commenter_portrait_is_none(self):
         self.assertEqual(
             self.viewlet.get_commenter_portrait(),
-            'defaultUser.gif'
+            'defaultUser.png'
         )
 
     def test_get_commenter_portrait_without_userimage(self):