From: Bartosz Dziewoński <matma.rex@gmail.com>
Date: Thu, 14 Apr 2016 21:16:22 +0000 (+0200)
Subject: mediawiki.special.upload: Don't fail when trying to thumbnail invalid file
X-Git-Tag: 1.31.0-rc.0~7283^2
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmes_infos.php?a=commitdiff_plain;h=b11b51847bfbeddb3e000b715763584b0fc30989;p=lhc%2Fweb%2Fwiklou.git

mediawiki.special.upload: Don't fail when trying to thumbnail invalid file

The thumbnail spinner would spin forever if we never got a 'load' event
on the image.

Bug: T132242
Change-Id: I1c68ed185b58950c3648f56e07144bb29a8bed56
---

diff --git a/resources/src/mediawiki.special/mediawiki.special.upload.js b/resources/src/mediawiki.special/mediawiki.special.upload.js
index 6bbe32d38c..377b1f7ebd 100644
--- a/resources/src/mediawiki.special/mediawiki.special.upload.js
+++ b/resources/src/mediawiki.special/mediawiki.special.upload.js
@@ -407,6 +407,10 @@
 
 					$( '#mw-upload-thumbnail .fileinfo' ).text( info );
 				};
+				img.onerror = function () {
+					// Can happen for example for invalid SVG files
+					clearPreview();
+				};
 				img.src = dataURL;
 			}, mw.config.get( 'wgFileCanRotate' ) ? function ( data ) {
 				try {