Dzahn has submitted this change and it was merged.
Change subject: (bug 46837) improve Bugzilla wikilinking
......................................................................
(bug 46837) improve Bugzilla wikilinking
* support non-ASCII characters in the link
* support and percent-encode characters such as '&'
* support [[a|b]] form, because why not
Change-Id: Ie3dbf0a68e94db15b1daacea25f443ca2392be96
---
M bugzilla-4.2/extensions/Wikimedia/Extension.pm
1 file changed, 5 insertions(+), 3 deletions(-)
Approvals:
Aklapper: Looks good to me, but someone else must approve
Dzahn: Verified; Looks good to me, approved
diff --git a/bugzilla-4.2/extensions/Wikimedia/Extension.pm
b/bugzilla-4.2/extensions/Wikimedia/Extension.pm
index 9ca5125..327c1bc 100644
--- a/bugzilla-4.2/extensions/Wikimedia/Extension.pm
+++ b/bugzilla-4.2/extensions/Wikimedia/Extension.pm
@@ -38,7 +38,7 @@
my $regexes = $args->{'regexes'};
my $text = $args->{'text'};
my $replacerWP = {
- match => qr{\[\[([a-zA-Z0-9_ ,./'()!#\*\$%:\x80-\xff-]+)\]\]},
+ match => qr{\[\[([^<>\[\]\|\{\}]+)(\||\]\])},
replace => \&_createWikipediaLink
};
my $replacerCR = {
@@ -78,8 +78,10 @@
sub _createWikipediaLink {
my $match_str = $1;
- my $tmp = html_quote($match_str);
- my $wikipedia_link = "[[<a
href='https://en.wikipedia.org/w/index.php?title=Special:Search&go=Go&search=$tmp'>$tmp</a>]]";
+ my $tail = $2;
+ my $linktext = html_quote($match_str);
+ my $searchstring = html_quote(url_quote($match_str));
+ my $wikipedia_link = "[[<a
href=\"https://en.wikipedia.org/w/index.php?title=Special:Search&go=Go&search=$searchstring\";>$linktext</a>$tail";
return $wikipedia_link;
};
--
To view, visit https://gerrit.wikimedia.org/r/54503
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie3dbf0a68e94db15b1daacea25f443ca2392be96
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/bugzilla/modifications
Gerrit-Branch: master
Gerrit-Owner: Matmarex <matma....@gmail.com>
Gerrit-Reviewer: Aklapper <aklap...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Matmarex <matma....@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
