Bug 236533 : Text "Additional Comments From ..." can be improved

Patch by Todd Stansell <tjs@tellme.com>   r=kiko    a=myk

diff --git a/globals.pl b/globals.pl
index 5c7da1a158fd488baaf67e6c33a29ddd9b26819b..32dc64a6d7ae6d34130bf7161b4851fe48f6170c 100644 (file)
--- a/globals.pl
+++ b/globals.pl
@@ -1134,7 +1134,8 @@ sub GetLongDescriptionAsText {
         # If the start is all zeros, then don't do this (because we want to
         # not emit a leading "Additional Comments" line in that case.)
         $query .= "AND longdescs.bug_when > '$start'";
-        $count = 1;
+        SendSQL("SELECT count(*) FROM longdescs WHERE bug_id = $id AND bug_when <= '$start'");
+        ($count) = (FetchSQLData());
     }
     if ($end) {
         $query .= "AND longdescs.bug_when <= '$end'";
@@ -1145,7 +1146,7 @@ sub GetLongDescriptionAsText {
     while (MoreSQLData()) {
         my ($who, $when, $text, $isprivate, $work_time) = (FetchSQLData());
         if ($count) {
-            $result .= "\n\n------- Additional Comments From $who".Param('emailsuffix')."  ".
+            $result .= "\n\n------- Additional comment #$count from $who".Param('emailsuffix')."  ".
                 Bugzilla::Util::format_time($when) . " -------\n";
         }
         if (($isprivate > 0) && Param("insidergroup")) {