Merge "make XmlDumpwriter more resilient to blob store corruption"

diff --git a/includes/export/XmlDumpWriter.php b/includes/export/XmlDumpWriter.php
index f34b3bd..0003506 100644 (file)
--- 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 {