diff options
| -rw-r--r-- | classes/handler/public.php | 2 | ||||
| -rw-r--r-- | templates/generated_feed.txt | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/classes/handler/public.php b/classes/handler/public.php index c5a2a03cb..a656ed63b 100644 --- a/classes/handler/public.php +++ b/classes/handler/public.php @@ -123,7 +123,7 @@ class Handler_Public extends Handler { $tpl->setVariable('ARTICLE_AUTHOR', htmlspecialchars($line['author']), true); $tpl->setVariable('ARTICLE_SOURCE_LINK', htmlspecialchars($line['site_url']), true); - $tpl->setVariable('ARTICLE_SOURCE_TITLE', htmlspecialchars($line['feed_title']), true); + $tpl->setVariable('ARTICLE_SOURCE_TITLE', htmlspecialchars($line['feed_title'] ? $line['feed_title'] : $feed_title), true); $tags = get_article_tags($line["id"], $owner_uid); diff --git a/templates/generated_feed.txt b/templates/generated_feed.txt index c1f921c45..5e35f9be1 100644 --- a/templates/generated_feed.txt +++ b/templates/generated_feed.txt @@ -15,13 +15,15 @@ <entry> <id>${ARTICLE_ID}</id> <link href="${ARTICLE_LINK}" rel="alternate" type="text/html"/> - <title>${ARTICLE_TITLE}</title> + <title type="html">${ARTICLE_TITLE}</title> <summary type="html"><![CDATA[${ARTICLE_EXCERPT}]]></summary> <content type="html"><![CDATA[${ARTICLE_CONTENT}]]></content> <updated>${ARTICLE_UPDATED_ATOM}</updated> <author><name>${ARTICLE_AUTHOR}</name></author> <source> + <id>${ARTICLE_SOURCE_LINK}</id> <link rel="self" href="${ARTICLE_SOURCE_LINK}"/> + <updated>${ARTICLE_UPDATED_ATOM}</updated> <title>${ARTICLE_SOURCE_TITLE}</title></source> <!-- $BeginBlock category --> <category term="${ARTICLE_CATEGORY}"/> |