Peter M. Groen / knowledgetree

Commit af2ae89a68829a6ffb3990fb9bd335d94f011a34

Authored by Kevin Fourie
1 parent 1cfd76d4

Merged in from STABLE trunk... 

KTS-2108
"Unusual characters not reflected correctly in a Discussion on a document"
Fixed.

Committed By: Kevin
Reviewed By: Conrad

KTS-2105
"Spelling Error "aggragator" on RSS Instruction Page"
Fixed.

Committed By: Kevin
Reviewed By: Conrad


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@6795 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 2 changed files with 6 additions and 6 deletions
lib/discussions/DiscussionComment.inc
  View file @af2ae89
@@ -62,10 +62,10 @@ class DiscussionComment extends KTEntity { @@ -62,10 +62,10 @@ class DiscussionComment extends KTEntity {
62 function setThreadId($iThreadId){ $this->iThreadId = $iThreadId; } 62 function setThreadId($iThreadId){ $this->iThreadId = $iThreadId; }
63 function getUserId(){ return $this->iUserId; } 63 function getUserId(){ return $this->iUserId; }
64 function setUserId($iNewUserId){ $this->iUserId = $iNewUserId; } 64 function setUserId($iNewUserId){ $this->iUserId = $iNewUserId; }
65 - function getSubject(){ return $this->sSubject; }  
66 - function setSubject($sNewSubject){ $this->sSubject = $sNewSubject; }  
67 - function getBody(){ return $this->sBody; }  
68 - function setBody($sNewBody){ $this->sBody = $sNewBody; } 65 + function getSubject(){ return sanitizeForSQLtoHTML($this->sSubject); }
  66 + function setSubject($sNewSubject){ $this->sSubject = sanitizeForSQL($sNewSubject); }
  67 + function getBody(){ return sanitizeForSQLtoHTML($this->sBody); }
  68 + function setBody($sNewBody){ $this->sBody = sanitizeForSQL($sNewBody); }
69 function getDate(){ return $this->dDate; } 69 function getDate(){ return $this->dDate; }
70 function getInReplyTo(){ return $this->iInReplyTo; } 70 function getInReplyTo(){ return $this->iInReplyTo; }
71 function setInReplyTo($sNewCommentId){ $this->iInReplyTo = $sNewCommentId; } 71 function setInReplyTo($sNewCommentId){ $this->iInReplyTo = $sNewCommentId; }
plugins/rssplugin/templates/RSSPlugin/rssfolderaction.smarty
  View file @af2ae89
1 <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> 1 <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>
2 <p> 2 <p>
3 -{i18n}You can copy the following link into any RSS aggragator to create a feed to the selected folder.{/i18n} 3 +{i18n}You can copy the following link into any RSS aggregator to create a feed to the selected folder.{/i18n}
4 <ul> 4 <ul>
5 <li>{$link}</li> 5 <li>{$link}</li>
6 </ul> 6 </ul>
7 {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} 7 {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}
8 -</p>  
9 \ No newline at end of file 8 \ No newline at end of file
  9 +</p>