Jarry1250 has uploaded a new change for review. https://gerrit.wikimedia.org/r/90897
Change subject: Generalise filename-matching in mediawiki.Title.newFromImg() ...................................................................... Generalise filename-matching in mediawiki.Title.newFromImg() Both core and extensions can (and do) modify the thumbnail string e.g. to add page numbers, languages, etc. As bawolff notes in the commentary to bug 55963, the assumption that the filename itself appears twice is likely to be violated from time to time, but for the moment it suffices to fix the apparent regression described in that bug report. Bug: 55963 Change-Id: I9bb29a24f9bf50924699b913e31f44689906c525 --- M resources/mediawiki/mediawiki.Title.js 1 file changed, 2 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/97/90897/1 diff --git a/resources/mediawiki/mediawiki.Title.js b/resources/mediawiki/mediawiki.Title.js index b236019..4a64566 100644 --- a/resources/mediawiki/mediawiki.Title.js +++ b/resources/mediawiki/mediawiki.Title.js @@ -312,13 +312,12 @@ // thumb.php-generated thumbnails thumbPhpRegex = /thumb\.php/, - regexes = [ // Thumbnails - /\/[a-f0-9]\/[a-f0-9]{2}\/([^\s\/]+)\/[0-9]+px-\1[^\s\/]*$/, + /\/[a-f0-9]\/[a-f0-9]{2}\/([^\s\/]+)\/[^\s\/]+-\1[^\s\/]*$/, // Thumbnails in non-hashed upload directories - /\/([^\s\/]+)\/[0-9]+px-\1[^\s\/]*$/, + /\/([^\s\/]+)\/[^\s\/]+-\1[^\s\/]*$/, // Full size images /\/[a-f0-9]\/[a-f0-9]{2}\/([^\s\/]+)$/, -- To view, visit https://gerrit.wikimedia.org/r/90897 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9bb29a24f9bf50924699b913e31f44689906c525 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Jarry1250 <jarry1...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits