diff options
| -rw-r--r-- | bug_form.pl | 6 | ||||
| -rw-r--r-- | globals.pl | 34 |
2 files changed, 27 insertions, 13 deletions
diff --git a/bug_form.pl b/bug_form.pl index d3311fee5..b39570d4e 100644 --- a/bug_form.pl +++ b/bug_form.pl @@ -569,11 +569,11 @@ if ( Param("move-enabled") && (defined $::COOKIE{"Bugzilla_login"}) && ($::COOKI print "<BR></FORM>"; -print " -<table><tr><td align=left><B>Description:</B></td> +print qq| +<table><tr><td align=left><B><a name="0" href="#c0">Description:</a></B></td> <td align=right width=100%>Opened: $bug{'creation_ts'}</td></tr></table> <HR> -"; +|; print $bug{'long_desc'}; print " <HR>\n"; diff --git a/globals.pl b/globals.pl index 834c08d1c..32a55d143 100644 --- a/globals.pl +++ b/globals.pl @@ -891,6 +891,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 = $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) { my $item = $&; my $num = $2; @@ -1047,16 +1063,14 @@ 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 .= qq|<BR><BR><I>------- Additional Comment <a name="c$count" href="#c$count">#$count</a> From |; + if ($who) { + $result .= qq{<A HREF="mailto:$email">$who</A> }; + } else { + $result .= qq{<A HREF="mailto:$email">$email</A> }; + } + + $result .= time2str("%Y-%m-%d %H:%M", str2time($when)) . " -------</I><BR>\n"; } $result .= "<PRE>" . quoteUrls(\%knownattachments, $text) . "</PRE>\n"; $count++; |