From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Mon, 4 Apr 2011 09:36:21 +0000 (+0400)
Subject: generate_syndicated_feed: enable support for notes
X-Git-Tag: 1.5.3~72
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=9b1a708165dfa2fbc6693a69909b4f0e361477dd;p=tt-rss.git

generate_syndicated_feed: enable support for notes
---

diff --git a/functions.php b/functions.php
index 26a97367..67edc578 100644
--- a/functions.php
+++ b/functions.php
@@ -3678,8 +3678,15 @@
 			$tpl->setVariable('ARTICLE_TITLE', htmlspecialchars($line['title']));
 			$tpl->setVariable('ARTICLE_EXCERPT',
 				truncate_string(strip_tags($line["content_preview"]), 100, '...'));
-			$tpl->setVariable('ARTICLE_CONTENT',
-				sanitize_rss($link, $line["content_preview"], false, $owner_uid));
+
+			$content = sanitize_rss($link, $line["content_preview"], false, $owner_uid);
+
+			if ($line['note']) {
+				$content = "<div style=\"$note_style\">" . $line['note'] . "</div>" .
+					$content;
+			}
+
+			$tpl->setVariable('ARTICLE_CONTENT', $content);
 
 			$tpl->setVariable('ARTICLE_UPDATED', date('c', strtotime($line["updated"])));
 			$tpl->setVariable('ARTICLE_AUTHOR', htmlspecialchars($line['author']));