Merge pull request #1544 from nextcloud/backport/1536/stable27

[stable27] fix rss feed item guid
nextcloud · Feb 3, 2024 · 3edcaa9 · 3edcaa9
2 parents d79916b + 64171ec
commit 3edcaa9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/templates/rss.php b/templates/rss.php
@@ -34,7 +34,7 @@
 		<atom:link href="<?php p($_['rssLink']); ?>" rel="self" type="application/rss+xml" />
 <?php foreach ($_['activities'] as $activity) { ?>
 		<item>
-			<guid isPermaLink="false"><?php p($activity['activity_id']); ?></guid>
+			<guid isPermaLink="false"><?php p($_['rssLink'] . '?id=' . $activity['activity_id']); ?></guid>
 <?php if (!empty($activity['subject'])): ?>
 			<title><?php p(str_replace("\n", ' ', $activity['subject'])); ?></title>
 <?php endif; ?>

diff --git a/tests/Template/RssTest.php b/tests/Template/RssTest.php
@@ -77,15 +77,15 @@ public function dataContent(): array {
 					['activity_id' => 1337, 'subject' => '', 'link' => '', 'timestamp' => 0, 'message' => ''],
 				],
 				'		<item>'
-				. "\n" . '			<guid isPermaLink="false">1337</guid>'
+				. "\n" . '			<guid isPermaLink="false">http://nextcloud.org?id=1337</guid>'
 				. "\n" . '		</item>',
 			],
 			[
 				[
 					['activity_id' => 42, 'subject' => 'text', 'link' => 'http://docs.nextcloud.org', 'timestamp' => 21, 'message' => 'text2'],
 				],
 				'		<item>'
-				. "\n" . '			<guid isPermaLink="false">42</guid>'
+				. "\n" . '			<guid isPermaLink="false">http://nextcloud.org?id=42</guid>'
 				. "\n" . '			<title>text</title>'
 				. "\n" . '			<link>http://docs.nextcloud.org</link>'
 				. "\n" . '			<pubDate>Thu, 01 Jan 1970 00:00:21 +0000</pubDate>'
@@ -97,7 +97,7 @@ public function dataContent(): array {
 					['activity_id' => 42, 'subject' => 'text', 'link' => 'http://docs.nextcloud.org', 'timestamp' => 21],
 				],
 				'		<item>'
-				. "\n" . '			<guid isPermaLink="false">42</guid>'
+				. "\n" . '			<guid isPermaLink="false">http://nextcloud.org?id=42</guid>'
 				. "\n" . '			<title>text</title>'
 				. "\n" . '			<link>http://docs.nextcloud.org</link>'
 				. "\n" . '			<pubDate>Thu, 01 Jan 1970 00:00:21 +0000</pubDate>'