update

microweber · May 4, 2022 · e9bd4f8 · e9bd4f8
1 parent 4aed670
commit e9bd4f8
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/src/MicroweberPackages/App/Http/Controllers/RssController.php b/src/MicroweberPackages/App/Http/Controllers/RssController.php
@@ -48,7 +48,16 @@ public function index(Request $request)
                 $tmp['id'] = $item['id'];
                 $tmp['url'] = content_link($item['id']);
                 $tmp['title'] = $item['title'];
-                $tmp['description'] = content_description($item['id']);
+                $content = content_description($item['id']);;
+                if(isset($item['content']) and $item['content']){
+                    $content = $item['content'];
+                }
+
+                if(isset($item['content_body']) and $item['content_body']){
+                    $content = $item['content_body'];
+                }
+                $content = app()->url_manager->replace_site_url_back($content);
+                $tmp['description'] = $content;
                 $tmp['tags'] = content_tags($item['id']);
                 $tmp['categories'] = content_categories($item['id']);
 

diff --git a/src/MicroweberPackages/App/resources/views/rss/atom.blade.php b/src/MicroweberPackages/App/resources/views/rss/atom.blade.php
@@ -18,8 +18,8 @@
                 @php
                     if (!empty($item['categories'])) {
                         foreach ($item['categories'] as $catItem) {
-                            echo '<category term="'.urlencode($catItem['title']).'"></category>';
-                        }
+                            echo '<category label="'.htmlentities($catItem['title']).'"  term="'.htmlentities($catItem['url']).'"></category>';
+                         }
                     }
                @endphp
 
@@ -32,9 +32,7 @@
                @endphp
 
                 @if(!empty($item['description']))
-                <content type="html" xml:base="{{ $item['url'] }}">
-                    <![CDATA[ {{ $item['description'] }} ]]>
-                </content>
+                <content type="html" xml:base="{{ $item['url'] }}"><![CDATA[ {{ $item['description'] }} ]]></content>
                 @endif
 
             </item>

diff --git a/src/MicroweberPackages/App/resources/views/rss/wordpress.blade.php b/src/MicroweberPackages/App/resources/views/rss/wordpress.blade.php
@@ -4,7 +4,7 @@
         <post>
             <id>{{ $item['id'] }}</id>
             <Title><![CDATA[{{ $item['title'] }}]]></Title>
-            <Content><![CDATA[ {{ $item['description'] }} ]]></Content>
+            <Content><![CDATA[{{ $item['description'] }}]]></Content>
 
             <Link>{{ $item['url'] }}</Link>
 
@@ -33,7 +33,7 @@
             ]]></Tags>
 
             @if(!empty($item['image_url']))
-                <ImageURL><![CDATA[{{ $item['image_url'] }}]]></ImageURL>
+                <ImageURL><![CDATA[{{$item['image_url']}}]]></ImageURL>
             @endif
 
         </post>