Parcourir la source

Fix broken cron regression 6541 (#6548)

Fix https://github.com/FreshRSS/FreshRSS/issues/6547
Regression https://github.com/FreshRSS/FreshRSS/pull/6541
Alexandre Alapetite il y a 1 an
Parent
commit
86f48db4a7
2 fichiers modifiés avec 5 ajouts et 3 suppressions
  1. 2 2
      app/Models/View.php
  2. 3 1
      app/views/index/rss.phtml

+ 2 - 2
app/Models/View.php

@@ -106,8 +106,8 @@ class FreshRSS_View extends Minz_View {
 	public string $rss_url = '';
 	public string $rss_base = '';
 	public bool $internal_rendering = false;
-	public string $description;
-	public string $image_url;
+	public string $description = '';
+	public string $image_url = '';
 
 	// Content preview
 	public string $fatalError;

+ 3 - 1
app/views/index/rss.phtml

@@ -9,15 +9,17 @@
 	<channel>
 		<title><?= $this->rss_title ?></title>
 		<link><?= $this->html_url ?></link>
-		<description><?= $this->description ?></description>
+		<description><?= $this->description ?: _t('index.feed.rss_of', $this->rss_title) ?></description>
 		<pubDate><?= date('D, d M Y H:i:s O') ?></pubDate>
 		<lastBuildDate><?= gmdate('D, d M Y H:i:s') ?> GMT</lastBuildDate>
 		<atom:link href="<?= $this->rss_url ?>" rel="self" type="application/rss+xml" />
+		<?php if ($this->image_url !== ''): ?>
 		<image>
 			<url><?= $this->image_url ?></url>
 			<title><?= $this->rss_title ?></title>
 			<link><?= $this->html_url ?></link>
 		</image>
+		<?php endif; ?>
 <?php
 foreach ($this->entries as $item) {
 	if (!$this->internal_rendering) {