Bartosz Dziewoński has uploaded a new change for review.
https://gerrit.wikimedia.org/r/292051
Change subject: mw.Title: Correct order of file URL regexes in newFromImg
......................................................................
mw.Title: Correct order of file URL regexes in newFromImg
The "Thumbnails in non-hashed upload directories" regex can match
non-thumbnailed files in hashed directories if the file name contains
the word "thumbnail" or the first two bytes of the MD5 hash of the
file name. We should check "Full size images" first.
Bug: T134860
Change-Id: I74af47969bf9ba204c24e299f788f5349302e437
---
M resources/src/mediawiki/mediawiki.Title.js
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/51/292051/1
diff --git a/resources/src/mediawiki/mediawiki.Title.js
b/resources/src/mediawiki/mediawiki.Title.js
index 6859592..ff4d1c2 100644
--- a/resources/src/mediawiki/mediawiki.Title.js
+++ b/resources/src/mediawiki/mediawiki.Title.js
@@ -664,12 +664,12 @@
// Thumbnails
/\/[a-f0-9]\/[a-f0-9]{2}\/([^\s\/]+)\/[^\s\/]+-[^\s\/]*$/,
- // Thumbnails in non-hashed upload directories
-
/\/([^\s\/]+)\/[^\s\/]+-(?:\1|thumbnail)[^\s\/]*$/,
-
// Full size images
/\/[a-f0-9]\/[a-f0-9]{2}\/([^\s\/]+)$/,
+ // Thumbnails in non-hashed upload directories
+
/\/([^\s\/]+)\/[^\s\/]+-(?:\1|thumbnail)[^\s\/]*$/,
+
// Full-size images in non-hashed upload
directories
/\/([^\s\/]+)$/
],
--
To view, visit https://gerrit.wikimedia.org/r/292051
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I74af47969bf9ba204c24e299f788f5349302e437
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <matma....@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
