From 16c15e5201a38a2dda0cf5daf654dae39b043cc2 Mon Sep 17 00:00:00 2001 From: "jake%acutex.net" <> Date: Sat, 20 Oct 2001 19:59:57 +0000 Subject: Backing out previous change, the wrong patch got checked in. --- bug_form.pl | 2 +- globals.pl | 36 ++++++++++-------------------------- 2 files changed, 11 insertions(+), 27 deletions(-) diff --git a/bug_form.pl b/bug_form.pl index e07a118bd..d3311fee5 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:
Description: Opened: $bug{'creation_ts'}

"; diff --git a/globals.pl b/globals.pl index 4b9c7c9e7..834c08d1c 100644 --- a/globals.pl +++ b/globals.pl @@ -891,22 +891,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 = $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; @@ -1063,16 +1047,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