From 1e87283250635a69e5d855d1bd5d075253796e88 Mon Sep 17 00:00:00 2001
From: "lpsolit%gmail.com" <>
Date: Wed, 8 Aug 2007 19:14:23 +0000
Subject: Hum... 2nd attempt to fix bug 332149. I committed the wrong patch
 *and* I lost connection in the middle of the commit. Bad!

---
 template/en/default/bug/comments.html.tmpl | 11 +++++++++--
 template/en/default/bug/show.xml.tmpl      |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

(limited to 'template/en/default/bug')

diff --git a/template/en/default/bug/comments.html.tmpl b/template/en/default/bug/comments.html.tmpl
index 428b8771c..5df295423 100644
--- a/template/en/default/bug/comments.html.tmpl
+++ b/template/en/default/bug/comments.html.tmpl
@@ -172,10 +172,17 @@
           <a name="c[% count %]" href="show_bug.cgi?id=[% bug.bug_id %]#c[% count %]">
             #[% count %]</a> From 
           <span class="vcard">
-            <a class="fn email" href="mailto:[% comment.email FILTER html %]">
-              [% (comment.name || comment.email) FILTER html %]
+            <a class="fn email" href="mailto:[% comment.author.email FILTER html %]">
+              [% (comment.author.name || comment.author.login) FILTER html %]
             </a>
           </span>
+          [% FOREACH group = comment.author.direct_group_membership %]
+            [% NEXT UNLESS group.icon_url %]
+            <img src="[% group.icon_url FILTER html %]"
+                 alt="[% group.name FILTER html %]"
+                 title="[% group.name FILTER html %] - [% group.description FILTER html %]">
+          [% END %]
+
           [%+ comment.time FILTER time %] 
           </i>
           [% IF mode == "edit" %]
diff --git a/template/en/default/bug/show.xml.tmpl b/template/en/default/bug/show.xml.tmpl
index 6db4aab27..4fbb6dc61 100644
--- a/template/en/default/bug/show.xml.tmpl
+++ b/template/en/default/bug/show.xml.tmpl
@@ -69,7 +69,7 @@
         [% FOREACH c = bug.longdescs %]
           [% NEXT IF c.isprivate && !user.in_group(Param("insidergroup")) %]
           <long_desc isprivate="[% c.isprivate FILTER xml %]">
-            <who name="[% c.name FILTER xml %]">[% c.email FILTER xml %]</who>
+            <who name="[% c.author.name FILTER xml %]">[% c.author.email FILTER xml %]</who>
             <bug_when>[% c.time FILTER time FILTER xml %]</bug_when>
             [% IF user.in_group(Param('timetrackinggroup')) && (c.work_time - 0 != 0) %]
               <work_time>[% PROCESS formattimeunit time_unit = c.work_time FILTER xml %]</work_time>
-- 
cgit v1.2.3-24-g4f1b