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 60d26012f1df29e1db0a51911bc0d344e4efe10a..f19c64d78fe5d3dc049143eeaea5daf51c582143 100644 (file)
--- 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 2d4a20303d2f18179102ce04514530311b534675..7a65aed244be563c6c2f6f1a5cd90adef9d31442 100644 (file)
--- 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 %]