Commit 16c15e52 authored by jake%acutex.net's avatar jake%acutex.net

Backing out previous change, the wrong patch got checked in.

parent 0a39f7d1
...@@ -570,7 +570,7 @@ if ( Param("move-enabled") && (defined $::COOKIE{"Bugzilla_login"}) && ($::COOKI ...@@ -570,7 +570,7 @@ if ( Param("move-enabled") && (defined $::COOKIE{"Bugzilla_login"}) && ($::COOKI
print "<BR></FORM>"; print "<BR></FORM>";
print " print "
<table><tr><td align=left><B><a name=\"c0\" href=\"#c0\">Description:</a></B></td> <table><tr><td align=left><B>Description:</B></td>
<td align=right width=100%>Opened: $bug{'creation_ts'}</td></tr></table> <td align=right width=100%>Opened: $bug{'creation_ts'}</td></tr></table>
<HR> <HR>
"; ";
......
...@@ -891,22 +891,6 @@ sub quoteUrls { ...@@ -891,22 +891,6 @@ sub quoteUrls {
$things[$count++] = $item; $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{<A HREF="#c$num">$item</A>};
$things[$count++] = $item;
}
while ($text =~ s/\bbug(\s|%\#)*(\d+)/"##$count##"/ei) { while ($text =~ s/\bbug(\s|%\#)*(\d+)/"##$count##"/ei) {
my $item = $&; my $item = $&;
my $num = $2; my $num = $2;
...@@ -1063,16 +1047,16 @@ sub GetLongDescriptionAsHTML { ...@@ -1063,16 +1047,16 @@ sub GetLongDescriptionAsHTML {
my ($who, $email, $when, $text) = (FetchSQLData()); my ($who, $email, $when, $text) = (FetchSQLData());
$email .= Param('emailsuffix'); $email .= Param('emailsuffix');
if ($count) { if ($count) {
$result .= "<BR><BR><I>------- Additional Comment <a name='c$count' href='#c$count'>#$count</a> From "; $result .= "<BR><BR><I>------- Additional Comments From ";
if ($who) { if ($who) {
$result .= qq{<A HREF="mailto:$email">$who</A> } . $result .= qq{<A HREF="mailto:$email">$who</A> } .
time2str("%Y-%m-%d %H:%M", str2time($when)); time2str("%Y-%m-%d %H:%M", str2time($when)) .
} else { " -------</I><BR>\n";
$result .= qq{<A HREF="mailto:$email">$email</A> } . } else {
time2str("%Y-%m-%d %H:%M", str2time($when)); $result .= qq{<A HREF="mailto:$email">$email</A> } .
} time2str("%Y-%m-%d %H:%M", str2time($when)) .
" -------</I><BR>\n";
$result .= " -------</I><BR>\n"; }
} }
$result .= "<PRE>" . quoteUrls(\%knownattachments, $text) . "</PRE>\n"; $result .= "<PRE>" . quoteUrls(\%knownattachments, $text) . "</PRE>\n";
$count++; $count++;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment