From: Frédéric Buclin <LpSolit@gmail.com>
Date: Sat, 21 Aug 2010 10:22:49 +0000 (+0200)
Subject: Bug 584115: Some comments incorrectly disappear for users not in the timetracking... 
X-Git-Tag: bugzilla-4.0rc1~90
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5fbb730fc583d3fb28ff32d36a66fa9543ee7954;p=thirdparty%2Fbugzilla.git

Bug 584115: Some comments incorrectly disappear for users not in the timetracking group
r/a=mkanat
---

diff --git a/template/en/default/bug/comments.html.tmpl b/template/en/default/bug/comments.html.tmpl
index af6cc21911..e44e4e7b95 100644
--- a/template/en/default/bug/comments.html.tmpl
+++ b/template/en/default/bug/comments.html.tmpl
@@ -89,7 +89,8 @@
 
 [% BLOCK a_comment %]
   [% RETURN IF comment.is_private AND ! user.is_insider %]
-  [% RETURN IF comment.body == '' AND comment.work_time != 0 AND !user.is_timetracker %]
+  [% comment_text = comment.body_full({ wrap => 1 }) %]
+  [% RETURN IF comment_text == '' AND (comment.work_time - 0) != 0 AND !user.is_timetracker %]
 
     <div id="c[% count %]" class="bz_comment[% " bz_private" IF comment.is_private %]
                 [% " bz_comment_hilite" IF marks.$count %]
@@ -162,7 +163,7 @@
   #%]
 <pre class="bz_comment_text" 
      [% ' id="comment_text_' _ count _ '"' IF mode == "edit" %]>
-  [%- comment.body_full({ wrap => 1 }) FILTER quoteUrls(bug, comment) -%]
+  [%- comment_text FILTER quoteUrls(bug, comment) -%]
 </pre>
     </div>
 [% END %]