From eda9600572d2fa7fec9a63f5c87da1c96e3afb17 Mon Sep 17 00:00:00 2001
From: "justdave%syndicomm.com" <>
Date: Fri, 12 Oct 2001 10:03:00 +0000
Subject: Backing out Gerv's checkin for bug 71840. Per the bug report, it did
not have proper review first, and myk objected to what got landed on irc.
---
globals.pl | 36 ++++++++++--------------------------
1 file changed, 10 insertions(+), 26 deletions(-)
(limited to 'globals.pl')
diff --git a/globals.pl b/globals.pl
index 401d9eef2..eedfa12e3 100644
--- a/globals.pl
+++ b/globals.pl
@@ -884,22 +884,6 @@ 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 = $6;
- $item = GetBugLink($bugnum, $item);
- $item =~ s/(id=\d+)/$1#$comnum/;
- $things[$count++] = $item;
- }
- while ($text =~ s/\bcom(ment)?(\s|%\#)*(\d+)/"##$count##"/ei) {
- my $item = $&;
- my $num = $3;
- $item = value_quote($item);
- $item = qq{$item};
- $things[$count++] = $item;
- }
while ($text =~ s/\bbug(\s|%\#)*(\d+)/"##$count##"/ei) {
my $item = $&;
my $num = $2;
@@ -1056,16 +1040,16 @@ sub GetLongDescriptionAsHTML {
my ($who, $email, $when, $text) = (FetchSQLData());
$email .= Param('emailsuffix');
if ($count) {
- $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 .= "
------- 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 .= "
" . quoteUrls(\%knownattachments, $text) . "\n"; $count++; -- cgit v1.2.3-24-g4f1b