Commit 67b3cc06 authored by gerv%gerv.net's avatar gerv%gerv.net

Bug 71840 - Make comments referenceable. Patch by gerv; r=myk, jake (ish :-).

parent 3454a7df
......@@ -569,7 +569,7 @@ if ( Param("move-enabled") && (defined $::COOKIE{"Bugzilla_login"}) && ($::COOKI
print "<BR></FORM>";
print "
<table><tr><td align=left><B>Description:</B></td>
<table><tr><td align=left><B><a name=\"0\" href=\"#0\">Description:</a></B></td>
<td align=right width=100%>Opened: $bug{'creation_ts'}</td></tr></table>
<HR>
";
......
......@@ -884,6 +884,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 = $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;
......@@ -1040,16 +1056,16 @@ sub GetLongDescriptionAsHTML {
my ($who, $email, $when, $text) = (FetchSQLData());
$email .= Param('emailsuffix');
if ($count) {
$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 .= "<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 .= "<PRE>" . quoteUrls(\%knownattachments, $text) . "</PRE>\n";
$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