summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Bugzilla/Template.pm10
-rw-r--r--globals.pl7
-rw-r--r--template/en/default/bug/comments.html.tmpl2
-rw-r--r--template/en/default/bug/process/midair.html.tmpl2
4 files changed, 16 insertions, 5 deletions
diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm
index 04a4db204..7dfb5c539 100644
--- a/Bugzilla/Template.pm
+++ b/Bugzilla/Template.pm
@@ -402,7 +402,15 @@ sub create {
# as prefix. In addition it replaces a ' ' by a '_'.
css_class_quote => \&Bugzilla::Util::css_class_quote ,
- quoteUrls => \&::quoteUrls ,
+ quoteUrls => [ sub {
+ my ($context, $bug) = @_;
+ return sub {
+ my $text = shift;
+ return &::quoteUrls($text, $bug);
+ };
+ },
+ 1
+ ],
bug_link => [ sub {
my ($context, $bug) = @_;
diff --git a/globals.pl b/globals.pl
index 8fd88fc13..6240b9737 100644
--- a/globals.pl
+++ b/globals.pl
@@ -485,7 +485,7 @@ sub get_component_name {
# If you want to modify this routine, read the comments carefully
sub quoteUrls {
- my ($text) = (@_);
+ my ($text, $curr_bugid) = (@_);
return $text unless $text;
# We use /g for speed, but uris can have other things inside them
@@ -547,6 +547,9 @@ sub quoteUrls {
("\0\0" . ($count-1) . "\0\0")
~egmxi;
+ # Current bug ID this comment belongs to
+ my $current_bugurl = $curr_bugid ? "show_bug.cgi?id=$curr_bugid" : "";
+
# This handles bug a, comment b type stuff. Because we're using /g
# we have to do this in one pattern, and so this is semi-messy.
# Also, we can't use $bug_re?$comment_re? because that will match the
@@ -557,7 +560,7 @@ sub quoteUrls {
~ # We have several choices. $1 here is the link, and $2-4 are set
# depending on which part matched
(defined($2) ? GetBugLink($2,$1,$3) :
- "<a href=\"#c$4\">$1</a>")
+ "<a href=\"$current_bugurl#c$4\">$1</a>")
~egox;
# Old duplicate markers
diff --git a/template/en/default/bug/comments.html.tmpl b/template/en/default/bug/comments.html.tmpl
index 9f0469a51..1ccf9904c 100644
--- a/template/en/default/bug/comments.html.tmpl
+++ b/template/en/default/bug/comments.html.tmpl
@@ -149,7 +149,7 @@
[% wrapped_comment = comment.body FILTER wrap_comment %]
[% END %]
<pre[% ' id="comment_text_' _ count _ '"' IF mode == "edit" %]>
- [%- wrapped_comment FILTER quoteUrls -%]
+ [%- wrapped_comment FILTER quoteUrls(bug.bug_id) -%]
</pre>
</div>
[% END %]
diff --git a/template/en/default/bug/process/midair.html.tmpl b/template/en/default/bug/process/midair.html.tmpl
index d5ae5fbf6..01b9916dd 100644
--- a/template/en/default/bug/process/midair.html.tmpl
+++ b/template/en/default/bug/process/midair.html.tmpl
@@ -57,7 +57,7 @@
<p>
Added the comment(s):
<blockquote>
- [% PROCESS "bug/comments.html.tmpl" %]
+ [% PROCESS "bug/comments.html.tmpl" bug = { 'bug_id' => bug_id } %]
</blockquote>
</p>
[% END %]