From 7f0e757bb522fda06eace048ee8542b55537aac1 Mon Sep 17 00:00:00 2001
From: reger <reger18@arcor.de>
Date: Mon, 21 Jul 2014 19:26:12 +0200
Subject: [PATCH] fix bookmark.rss - channel end tag postion - link with html
 entity

---
 htroot/Bookmarks.java |  4 ++--
 htroot/Bookmarks.rss  | 26 +++++++++++++-------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/htroot/Bookmarks.java b/htroot/Bookmarks.java
index 1c5b9595c..74733aa15 100644
--- a/htroot/Bookmarks.java
+++ b/htroot/Bookmarks.java
@@ -318,9 +318,9 @@ public class Bookmarks {
 
                     if (bookmark != null){
                         if (bookmark.getFeed() && isAdmin) {
-                            prop.put("display_bookmarks_"+count+"_link", "/FeedReader_p.html?url="+bookmark.getUrl());
+                            prop.putXML("display_bookmarks_"+count+"_link", "/FeedReader_p.html?url="+bookmark.getUrl());
                         } else {
-                            prop.put("display_bookmarks_"+count+"_link",bookmark.getUrl());
+                            prop.putXML("display_bookmarks_"+count+"_link",bookmark.getUrl());
                         }
                         prop.putHTML("display_bookmarks_"+count+"_title", bookmark.getTitle());
                         prop.putHTML("display_bookmarks_"+count+"_description", bookmark.getDescription());
diff --git a/htroot/Bookmarks.rss b/htroot/Bookmarks.rss
index f5dec691f..5a44ad6ce 100644
--- a/htroot/Bookmarks.rss
+++ b/htroot/Bookmarks.rss
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <rss version="2.0">
-	<channel>
-		<title><![CDATA[YaCy '#[clientname]#': Bookmarks]]></title>
-		<link>http://#[address]#/Bookmarks.html</link>
-		<description><![CDATA[#[user]#'s Bookmark-Feed]]></description>
-	</channel>
-	#{display_bookmarks}#<item>
-		<title><![CDATA[#[title]#]]></title>
-		<link>#[link]#</link>
-		<pubDate>#[rfc822date]#</pubDate>
-		<guid>#[hash]#</guid>
-		<description><![CDATA[<p>#[description]#</p><p>Tagged with | #{tags}#<a href="Bookmarks.html?tag=#[tag]#" class="bookmarkTags">#[tag]#</a> | #{/tags}#</p>]]></description>
-		#{tags}#<category><![CDATA[#[tag]#]]></category>#{/tags}#
-	</item>#{/display_bookmarks}#
+    <channel>
+        <title><![CDATA[YaCy '#[clientname]#': Bookmarks]]></title>
+        <link>http://#[address]#/Bookmarks.html</link>
+        <description><![CDATA[#[user]#'s Bookmark-Feed]]></description>
+        #{display_bookmarks}#<item>
+            <title><![CDATA[#[title]#]]></title>
+            <link>#[link]#</link>
+            <pubDate>#[rfc822date]#</pubDate>
+            <guid>#[hash]#</guid>
+            <description><![CDATA[<p>#[description]#</p><p>Tagged with | #{tags}#<a href="Bookmarks.html?tag=#[tag]#" class="bookmarkTags">#[tag]#</a> | #{/tags}#</p>]]></description>
+            #{tags}#<category><![CDATA[#[tag]#]]></category>#{/tags}#
+        </item>#{/display_bookmarks}#
+    </channel>
 </rss>
\ No newline at end of file