From 8670156642189cfde8327a0c71ddc13519f111a4 Mon Sep 17 00:00:00 2001
From: Wilfried Goesgens <dothebart@citadel.org>
Date: Mon, 5 Sep 2011 06:55:43 +0000
Subject: [PATCH] some things which were missed during the big merger.

---
 webcit/feed_generator.c   | 15 +++++++--------
 webcit/static/t/head.html |  3 ---
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/webcit/feed_generator.c b/webcit/feed_generator.c
index c94013fc5..3c0e06919 100644
--- a/webcit/feed_generator.c
+++ b/webcit/feed_generator.c
@@ -267,17 +267,16 @@ void tmplput_rssmeta(StrBuf *Target, WCTemplputParams *TP)
  */
 void tmplput_rssbutton(StrBuf *Target, WCTemplputParams *TP) 
 {
-	wcsession *WCC = WC;
-	char feed_link[1024];
-	char encoded_link[1024];
+	StrBuf *FeedLink = NULL;
 
-	strcpy(feed_link, "/feed_rss?go=");
-	urlesc(&feed_link[20], sizeof(feed_link) - 20, (char *)ChrPtr(WCC->CurRoom.name) );
-	CtdlEncodeBase64(encoded_link, feed_link, strlen(feed_link), 0);
+	FeedLink = NewStrBufPlain(HKEY("/feed_rss?go="));
+	StrBufUrlescAppend(FeedLink, WC->CurRoom.name, NULL);
 
-	StrBufAppendPrintf(Target, "<a type=\"application/rss+xml\" href=\"/B64%s\">", encoded_link);
-	StrBufAppendPrintf(Target, "<img src=\"static/webcit_icons/essen/16x16/rss.png\" alt=\"RSS\">");
+	StrBufAppendPrintf(Target, "<a type=\"application/rss+xml\" href=\"");
+	StrBufAppendBuf(Target, FeedLink, 0);
+	StrBufAppendPrintf(Target, "\"><img src=\"static/webcit_icons/essen/16x16/rss.png\" alt=\"RSS\">");
 	StrBufAppendPrintf(Target, "</a>");
+	FreeStrBuf(&FeedLink);
 }
 
 
diff --git a/webcit/static/t/head.html b/webcit/static/t/head.html
index b8f133229..a7cf607da 100644
--- a/webcit/static/t/head.html
+++ b/webcit/static/t/head.html
@@ -50,8 +50,5 @@
 	</div>
 </div>
 <!-- end modal box -->
-<noscript><div id="noscript_warning">
-<?_("WARNING: You have JavaScript disabled in your web browser.  Many functions of this system will not work properly.")>
-</div></noscript>
 <div id="global">
 <!--("end head.html")-->
-- 
2.30.2