Template.pm: add regexp fixes

Bugzilla/Template.pm

@@ -287,22 +287,23 @@ sub quoteUrls {
     }eg;
 
     # make eterbug number link to bug
-    $bug_re = qr/eterbug\#?$s*([0-9]+)/i;
+    $bug_re = qr/eterbug$s*\#?$s*([0-9]+)/i;
     # hack: user prev comment_re
-    $text =~ s~$bug_re
+    $text =~ s~($bug_re)
               ~ # We have several choices. $1 here is the link, and $2-4 are set
                 # depending on which part matched
-                get_bug_link($1, $1, { user => $user })
+                get_bug_link($2, $1, { user => $user })
               ~egx;
 
     # make # number link to bug
-    $bug_re = qr/[^&]\#$s*([0-9]+)/i;
+    #$bug_re = qr/[^&]\#$s*([0-9]+)/i;
+    $bug_re = qr/\#$s*([0-9]+)/i;
     #my $bug_ren = qr/\QTOG\E$s*\#?$s*([0-9]+)/i;
     # hack: user prev comment_re
-    $text =~ s~$bug_re
+    $text =~ s~($bug_re)
               ~ # We have several choices. $1 here is the link, and $2-4 are set
                 # depending on which part matched
-                get_bug_link($1, $1, { user => $user })
+                get_bug_link($2, $1, { user => $user })
               ~egx;