From 0a39f7d18a967e33f56bf084138b9ad12fdaf79f Mon Sep 17 00:00:00 2001
From: "gerv%gerv.net" <>
Date: Sat, 20 Oct 2001 08:06:57 +0000
Subject: [PATCH] Bug 71840 - make comments referenceable. Patch by gerv/jake.
r=justdave, jake/gerv.
---
bug_form.pl | 2 +-
globals.pl | 36 ++++++++++++++++++++++++++----------
2 files changed, 27 insertions(+), 11 deletions(-)
diff --git a/bug_form.pl b/bug_form.pl
index d3311fee5b..e07a118bd5 100644
--- a/bug_form.pl
+++ b/bug_form.pl
@@ -570,7 +570,7 @@ if ( Param("move-enabled") && (defined $::COOKIE{"Bugzilla_login"}) && ($::COOKI
print "
";
print "
-
Description: |
+
";
diff --git a/globals.pl b/globals.pl
index 834c08d1cc..4b9c7c9e7e 100644
--- a/globals.pl
+++ b/globals.pl
@@ -891,6 +891,22 @@ sub quoteUrls {
$things[$count++] = $item;
}
+ # Either a comment string or no comma and a compulsory #.
+ while ($text =~ s/\bbug(\s|%\#)*(\d+),?\s*comment\s*(\s|%\#)(\d+)/"##$count##"/ei) {
+ my $item = $&;
+ my $bugnum = $2;
+ my $comnum = $4;
+ $item = GetBugLink($bugnum, $item);
+ $item =~ s/(id=\d+)/$1#c$comnum/;
+ $things[$count++] = $item;
+ }
+ while ($text =~ s/\bcomment(\s|%\#)*(\d+)/"##$count##"/ei) {
+ my $item = $&;
+ my $num = $2;
+ $item = value_quote($item);
+ $item = qq{$item};
+ $things[$count++] = $item;
+ }
while ($text =~ s/\bbug(\s|%\#)*(\d+)/"##$count##"/ei) {
my $item = $&;
my $num = $2;
@@ -1047,16 +1063,16 @@ sub GetLongDescriptionAsHTML {
my ($who, $email, $when, $text) = (FetchSQLData());
$email .= Param('emailsuffix');
if ($count) {
- $result .= "
------- Additional Comments From ";
- if ($who) {
- $result .= qq{$who } .
- time2str("%Y-%m-%d %H:%M", str2time($when)) .
- " -------
\n";
- } else {
- $result .= qq{$email } .
- time2str("%Y-%m-%d %H:%M", str2time($when)) .
- " -------
\n";
- }
+ $result .= "
------- Additional Comment #$count From ";
+ if ($who) {
+ $result .= qq{$who } .
+ time2str("%Y-%m-%d %H:%M", str2time($when));
+ } else {
+ $result .= qq{$email } .
+ time2str("%Y-%m-%d %H:%M", str2time($when));
+ }
+
+ $result .= " -------
\n";
}
$result .= "" . quoteUrls(\%knownattachments, $text) . "
\n";
$count++;
--
2.47.2