From f0a504bb9af1a46a6f49b89462805dea0d287927 Mon Sep 17 00:00:00 2001
From: Dag <me@dvikan.no>
Date: Sat, 8 Jul 2023 23:36:36 +0200
Subject: [PATCH] fix(FeedMerge): allow xml parse failure too (#3518)

---
 bridges/FeedMergeBridge.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/bridges/FeedMergeBridge.php b/bridges/FeedMergeBridge.php
index dcc2493f..cf1b10a2 100644
--- a/bridges/FeedMergeBridge.php
+++ b/bridges/FeedMergeBridge.php
@@ -63,12 +63,20 @@ TEXT;
                 try {
                     $this->collectExpandableDatas($feed);
                 } catch (HttpException $e) {
+                    Logger::warning(sprintf('Exception in FeedMergeBridge: %s', create_sane_exception_message($e)));
                     $this->items[] = [
                         'title' => 'RSS-Bridge: ' . $e->getMessage(),
                         // Give current time so it sorts to the top
                         'timestamp' => time(),
                     ];
                     continue;
+                } catch (\Exception $e) {
+                    if (str_starts_with($e->getMessage(), 'Unable to parse xml')) {
+                        // Allow this particular exception from FeedExpander
+                        Logger::warning(sprintf('Exception in FeedMergeBridge: %s', create_sane_exception_message($e)));
+                        continue;
+                    }
+                    throw $e;
                 }
             } else {
                 $this->collectExpandableDatas($feed);