From 2cc8fe729e850d330558da72624112622f13e98f Mon Sep 17 00:00:00 2001 From: "gerv%gerv.net" <> Date: Thu, 7 Jan 2010 15:04:09 +0000 Subject: Bug 514703 - revert changes to bug link detection algorithm. r,a=LpSolit --- Bugzilla/Template.pm | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'Bugzilla') diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm index 046383094..c6da645b2 100644 --- a/Bugzilla/Template.pm +++ b/Bugzilla/Template.pm @@ -156,11 +156,6 @@ sub quoteUrls { my $chr1 = chr(1); $text =~ s/\0/$chr1\0/g; - # If the comment is already wrapped, we should ignore newlines when - # looking for matching regexps. Else we should take them into account. - my $s = ($comment && $comment->already_wrapped) - ? qr/\s/ : qr/[[:blank:]]/; - # However, note that adding the title (for buglinks) can affect things # In particular, attachment matches go before bug titles, so that titles # with 'attachment 1' don't double match. @@ -230,7 +225,7 @@ sub quoteUrls { ~$1$2~igx; # attachment links - $text =~ s~\b(attachment$s*\#?$s*(\d+)) + $text =~ s~\b(attachment\s*\#?\s*(\d+)) ~($things[$count++] = get_attachment_link($2, $1)) && ("\0\0" . ($count-1) . "\0\0") ~egmxi; @@ -243,9 +238,9 @@ sub quoteUrls { # Also, we can't use $bug_re?$comment_re? because that will match the # empty string my $bug_word = get_text('term', { term => 'bug' }); - my $bug_re = qr/\Q$bug_word\E$s*\#?$s*(\d+)/i; - my $comment_re = qr/comment$s*\#?$s*(\d+)/i; - $text =~ s~\b($bug_re(?:$s*,?$s*$comment_re)?|$comment_re) + my $bug_re = qr/\Q$bug_word\E\s*\#?\s*(\d+)/i; + my $comment_re = qr/comment\s*\#?\s*(\d+)/i; + $text =~ s~\b($bug_re(?:\s*,?\s*$comment_re)?|$comment_re) ~ # We have several choices. $1 here is the link, and $2-4 are set # depending on which part matched (defined($2) ? get_bug_link($2, $1, { comment_num => $3 }) : -- cgit v1.2.3-24-g4f1b