From 4976cd227ea8c92003bbf252fb8236f3980e3a8a Mon Sep 17 00:00:00 2001
From: User123698745 <User123698745@users.noreply.github.com>
Date: Fri, 4 Aug 2023 22:14:08 +0200
Subject: [PATCH] [FeedExpander] support xhtml content / content with child
 elements (#3598)

* [core] support xhtml content type in FeedExpander

* [FilterBridge] change defaultValue to exampleValue

* [core] support content with child elements in FeedExpander
---
 bridges/FilterBridge.php |  2 +-
 lib/FeedExpander.php     | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/bridges/FilterBridge.php b/bridges/FilterBridge.php
index 992fe0c3..ef739de3 100644
--- a/bridges/FilterBridge.php
+++ b/bridges/FilterBridge.php
@@ -12,7 +12,7 @@ class FilterBridge extends FeedExpander
         'url' => [
             'name' => 'Feed URL',
             'type'  => 'text',
-            'defaultValue' => 'https://lorem-rss.herokuapp.com/feed?unit=day',
+            'exampleValue' => 'https://lorem-rss.herokuapp.com/feed?unit=day',
             'required' => true,
         ],
         'filter' => [
diff --git a/lib/FeedExpander.php b/lib/FeedExpander.php
index 1bac6179..c91586d7 100644
--- a/lib/FeedExpander.php
+++ b/lib/FeedExpander.php
@@ -308,7 +308,16 @@ abstract class FeedExpander extends BridgeAbstract
             $item['author'] = (string)$feedItem->author->name;
         }
         if (isset($feedItem->content)) {
-            $item['content'] = (string)$feedItem->content;
+            $contentChildren = $feedItem->content->children();
+            if (count($contentChildren) > 0) {
+                $content = '';
+                foreach ($contentChildren as $contentChild) {
+                    $content .= $contentChild->asXML();
+                }
+                $item['content'] = $content;
+            } else {
+                $item['content'] = (string)$feedItem->content;
+            }
         }
 
         //When "link" field is present, URL is more reliable than "id" field