Bug 213440: quoteUrls() should permit multiple bug numbers to be linkified in comments

r/a=LpSolit

diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm
index f6796dfc779f30ba7b6d3e772f024dab90c3d72c..d00799900940dd5ee8f33ac4d7b3cf032085e164 100644 (file)
--- a/Bugzilla/Template.pm
+++ b/Bugzilla/Template.pm
@@ -244,6 +244,23 @@ sub quoteUrls {
                               "<a href=\"$current_bugurl#c$4\">$1</a>")
               ~egox;
 
+    # Handle a list of bug ids: bugs 1, #2, 3, 4
+    # Currently, the only delimiter supported is comma.
+    # Concluding "and" and "or" are not supported.
+    my $bugs_word = template_var('terms')->{bugs};
+
+    my $bugs_re = qr/\Q$bugs_word\E\s*\#?\s*
+                     \d+(?:\s*,\s*\#?\s*\d+)+/ix;
+    while ($text =~ m/($bugs_re)/go) {
+        my $offset = $-[0];
+        my $length = $+[0] - $-[0];
+        my $match  = $1;
+
+        $match =~ s/((?:#\s*)?(\d+))/get_bug_link($2, $1);/eg;
+        # Replace the old string with the linkified one.
+        substr($text, $offset, $length) = $match;
+    }
+
     # Old duplicate markers. These don't use $bug_word because they are old
     # and were never customizable.
     $text =~ s~(?<=^\*\*\*\ This\ bug\ has\ been\ marked\ as\ a\ duplicate\ of\ )