From: Max Kanat-Alexander <mkanat@bugzilla.org>
Date: Sat, 20 Feb 2010 19:52:25 +0000 (-0800)
Subject: Bug 499151: Only call format_comment when it's actually needed, as a slight
X-Git-Tag: bugzilla-3.7.1~235
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=abeb296487b58e9f03a3c0eea7b051874014b501;p=thirdparty%2Fbugzilla.git

Bug 499151: Only call format_comment when it's actually needed, as a slight
performance improvement.
r=glob, a=LpSolit
---

diff --git a/Bugzilla/Comment.pm b/Bugzilla/Comment.pm
index 60d26012f1..f19c64d78f 100644
--- a/Bugzilla/Comment.pm
+++ b/Bugzilla/Comment.pm
@@ -119,10 +119,15 @@ sub body_full {
     $params ||= {};
     my $template = Bugzilla->template_inner;
     my $body;
-    $template->process("bug/format_comment.txt.tmpl", 
-                       { comment => $self, %$params }, \$body)
-        || ThrowTemplateError($template->error());
-    $body =~ s/^X//;
+    if ($self->type) {
+        $template->process("bug/format_comment.txt.tmpl", 
+                           { comment => $self, %$params }, \$body)
+            || ThrowTemplateError($template->error());
+        $body =~ s/^X//;
+    }
+    else {
+        $body = $self->body;
+    }
     if ($params->{wrap} and !$self->already_wrapped) {
         $body = wrap_comment($body);
     }
diff --git a/template/en/default/bug/format_comment.txt.tmpl b/template/en/default/bug/format_comment.txt.tmpl
index 2d4a20303d..7a65aed244 100644
--- a/template/en/default/bug/format_comment.txt.tmpl
+++ b/template/en/default/bug/format_comment.txt.tmpl
@@ -63,8 +63,6 @@ Comment on attachment [% comment.extra_data %]
 [%+ comment.attachment.description %]
 
 [%+ comment.body %]
-[% ELSIF comment.type %]
-  [% Hook.process('type') %]
 [% ELSE %]
-X[% comment_body %]
+X[% Hook.process('type') %]
 [% END %]