X-Git-Url: http://git.cyclocoop.org/%28?a=blobdiff_plain;f=resources%2Fmediawiki%2Fmediawiki.Title.js;h=e1031c631df3e7660752b573df57528a77589e4d;hb=c528d00cecf80a498bd751c6cb114475667b5206;hp=dde5abff6858514e795764223b605579e05f76d3;hpb=c7011703ca598a6c457a00610fa39549b900f1fb;p=lhc%2Fweb%2Fwiklou.git diff --git a/resources/mediawiki/mediawiki.Title.js b/resources/mediawiki/mediawiki.Title.js index dde5abff68..e1031c631d 100644 --- a/resources/mediawiki/mediawiki.Title.js +++ b/resources/mediawiki/mediawiki.Title.js @@ -314,10 +314,10 @@ thumbPhpRegex = /thumb\.php/, regexes = [ // Thumbnails - /\/[a-f0-9]\/[a-f0-9]{2}\/([^\s\/]+)\/[^\s\/]+-\1[^\s\/]*$/, + /\/[a-f0-9]\/[a-f0-9]{2}\/([^\s\/]+)\/[^\s\/]+-(?:\1|thumbnail)[^\s\/]*$/, // Thumbnails in non-hashed upload directories - /\/([^\s\/]+)\/[^\s\/]+-\1[^\s\/]*$/, + /\/([^\s\/]+)\/[^\s\/]+-(?:\1|thumbnail)[^\s\/]*$/, // Full size images /\/[a-f0-9]\/[a-f0-9]{2}\/([^\s\/]+)$/, @@ -550,10 +550,12 @@ * Get the URL to this title * * @see mw.util#getUrl + * @param {Object} [params] A mapping of query parameter names to values, + * e.g. `{ action: 'edit' }`. * @return {string} */ - getUrl: function () { - return mw.util.getUrl( this.toString() ); + getUrl: function ( params ) { + return mw.util.getUrl( this.toString(), params ); }, /**