From: Ariel T. Glenn <ariel@wikimedia.org>
Date: Thu, 13 Jun 2019 14:18:58 +0000 (+0300)
Subject: when getting file (img) properties, suppress whines that it's not xml
X-Git-Tag: 1.31.6~15
X-Git-Url: http://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=5bbace1a3667997a6ecc94c2d7259615bdc4176c

when getting file (img) properties, suppress whines that it's not xml

Imports eventually succeed but the log fills up with stack traces
needlessly.

Bug: T206013
Change-Id: Icb004954272ea8fc6fbc4fd5090cd1310d66946c
(cherry picked from commit c9a05a70433ca420a52dd86eefd4feb4529d7e49)
---

diff --git a/includes/libs/mime/MimeAnalyzer.php b/includes/libs/mime/MimeAnalyzer.php
index 8d842cbb7b..d6c87b6e2a 100644
--- a/includes/libs/mime/MimeAnalyzer.php
+++ b/includes/libs/mime/MimeAnalyzer.php
@@ -760,7 +760,9 @@ EOT;
 		/**
 		 * look for XML formats (XHTML and SVG)
 		 */
+		Wikimedia\suppressWarnings();
 		$xml = new XmlTypeCheck( $file );
+		Wikimedia\restoreWarnings();
 		if ( $xml->wellFormed ) {
 			$xmlTypes = $this->xmlTypes;
 			if ( isset( $xmlTypes[$xml->getRootElement()] ) ) {