From af2ae89a68829a6ffb3990fb9bd335d94f011a34 Mon Sep 17 00:00:00 2001
From: Kevin Fourie <kevin@knowledgetree.com>
Date: Tue, 19 Jun 2007 08:42:49 +0000
Subject: [PATCH] Merged in from STABLE trunk...

---
 lib/discussions/DiscussionComment.inc                        | 8 ++++----
 plugins/rssplugin/templates/RSSPlugin/rssfolderaction.smarty | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/discussions/DiscussionComment.inc b/lib/discussions/DiscussionComment.inc
index b885588..2ef1f9f 100644
--- a/lib/discussions/DiscussionComment.inc
+++ b/lib/discussions/DiscussionComment.inc
@@ -62,10 +62,10 @@ class DiscussionComment extends KTEntity {
     function setThreadId($iThreadId){ $this->iThreadId = $iThreadId; }
     function getUserId(){ return $this->iUserId; } 
     function setUserId($iNewUserId){ $this->iUserId = $iNewUserId; }
-    function getSubject(){ return $this->sSubject; }
-    function setSubject($sNewSubject){ $this->sSubject = $sNewSubject; }
-    function getBody(){ return $this->sBody; }
-    function setBody($sNewBody){ $this->sBody = $sNewBody; }
+    function getSubject(){ return sanitizeForSQLtoHTML($this->sSubject); }
+    function setSubject($sNewSubject){ $this->sSubject = sanitizeForSQL($sNewSubject); }
+    function getBody(){ return sanitizeForSQLtoHTML($this->sBody); }
+    function setBody($sNewBody){ $this->sBody = sanitizeForSQL($sNewBody); }
     function getDate(){ return $this->dDate; }
     function getInReplyTo(){ return $this->iInReplyTo; }
     function setInReplyTo($sNewCommentId){ $this->iInReplyTo = $sNewCommentId; }
diff --git a/plugins/rssplugin/templates/RSSPlugin/rssfolderaction.smarty b/plugins/rssplugin/templates/RSSPlugin/rssfolderaction.smarty
index f2dd2e4..057aa18 100644
--- a/plugins/rssplugin/templates/RSSPlugin/rssfolderaction.smarty
+++ b/plugins/rssplugin/templates/RSSPlugin/rssfolderaction.smarty
@@ -1,8 +1,8 @@
 <h2><img src="{if $config->get("ui/morphEnabled") == '1'}{$rootUrl}/skins/kts_{$config->get("ui/morphTo")}/title_bullet.png{else}{$rootUrl}/resources/graphics/title_bullet.png{/if}"/>{i18n}RSS for folder{/i18n}: {$context->oFolder->getName()}</h2>
 <p>
-{i18n}You can copy the following link into any RSS aggragator to create a feed to the selected folder.{/i18n}
+{i18n}You can copy the following link into any RSS aggregator to create a feed to the selected folder.{/i18n}
 <ul>
 	<li>{$link}</li>
 </ul>
 {i18n arg_linkIcon="$linkIcon"}Another way of quickly accessing an RSS feed for a document or folder is by using the RSS icon #linkIcon#, which you will find in your actions portlet on the left.{/i18n}
-</p>
\ No newline at end of file
+</p>
--
libgit2 0.21.4