From: Ariel T. Glenn <ariel@wikimedia.org>
Date: Wed, 24 Jul 2019 05:56:41 +0000 (+0300)
Subject: make XmlDumpwriter more resilient to blob store corruption
X-Git-Tag: 1.34.0-rc.0~898^2
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/cotisations/voir.php?a=commitdiff_plain;h=a27820692f61842f15e1b75d153b9626a8854fbd;p=lhc%2Fweb%2Fwiklou.git

make XmlDumpwriter more resilient to blob store corruption

Loading content can also throw InvalidArgumentException when
the cluster address is an unknown cluster.

Bug: T228720
Change-Id: I313f9a5a27b21a33e90639abae3f505640c30e23
---

diff --git a/includes/export/XmlDumpWriter.php b/includes/export/XmlDumpWriter.php
index f34b3bd9d2..000350662b 100644
--- a/includes/export/XmlDumpWriter.php
+++ b/includes/export/XmlDumpWriter.php
@@ -310,7 +310,8 @@ class XmlDumpWriter {
 		} catch ( SuppressedDataException $ex ) {
 			return null;
 		} catch ( Exception $ex ) {
-			if ( $ex instanceof MWException || $ex instanceof RuntimeException ) {
+			if ( $ex instanceof MWException || $ex instanceof RuntimeException ||
+				$ex instanceof InvalidArgumentException ) {
 				MWDebug::warning( $warning . ': ' . $ex->getMessage() );
 				return null;
 			} else {