diff options
author | justdave%syndicomm.com <> | 2001-10-12 12:03:00 +0200 |
---|---|---|
committer | justdave%syndicomm.com <> | 2001-10-12 12:03:00 +0200 |
commit | eda9600572d2fa7fec9a63f5c87da1c96e3afb17 (patch) | |
tree | 9c274441aad542995737271f4f2315f704789798 /globals.pl | |
parent | 67b3cc06cb39fa6a8dac48041e3483e54ba3228a (diff) | |
download | bugzilla-eda9600572d2fa7fec9a63f5c87da1c96e3afb17.tar.gz bugzilla-eda9600572d2fa7fec9a63f5c87da1c96e3afb17.tar.xz |
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.
Diffstat (limited to 'globals.pl')
-rw-r--r-- | globals.pl | 36 |
1 files changed, 10 insertions, 26 deletions
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{<A HREF="#$num">$item</A>}; - $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 .= "<BR><BR><I>------- Additional Comment <a name='$count' href='#$count'>#$count</a> From "; - if ($who) { - $result .= qq{<A HREF="mailto:$email">$who</A> } . - time2str("%Y-%m-%d %H:%M", str2time($when)); - } else { - $result .= qq{<A HREF="mailto:$email">$email</A> } . - time2str("%Y-%m-%d %H:%M", str2time($when)); - } - - $result .= " -------</I><BR>\n"; + $result .= "<BR><BR><I>------- Additional Comments From "; + if ($who) { + $result .= qq{<A HREF="mailto:$email">$who</A> } . + time2str("%Y-%m-%d %H:%M", str2time($when)) . + " -------</I><BR>\n"; + } else { + $result .= qq{<A HREF="mailto:$email">$email</A> } . + time2str("%Y-%m-%d %H:%M", str2time($when)) . + " -------</I><BR>\n"; + } } $result .= "<PRE>" . quoteUrls(\%knownattachments, $text) . "</PRE>\n"; $count++; |