Peter M. Groen / knowledgetree

Commit f6ed52d7b2cf1c50ae30f821c39e891a1c2cb277

Authored by kevin_fourie
1 parent 4dbe6432

Merged in from DEV trunk... 

KTC-177
"RSS feed appears wrong when launched from the 'Actions on this folder' when the folder has the internationalisation string as its name or the name of any of its subfolders."
Fixed. added html encoding to title and removed sanitize from template...

Committed By: Jalaloedien Abrahams
Reviewed By: Conrad Vermeulen


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/trunk@7034 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 3 changed files with 4 additions and 4 deletions
lib/storage/ondiskhashedstoragemanager.inc.php
  View file @f6ed52d
... ... @@ -148,7 +148,7 @@ class KTOnDiskHashedStorageManager extends KTStorageManager {
148 148 $oUrlEncodedFileName = $oDocument->getFileName( );
149 149 $browser = $_SERVER['HTTP_USER_AGENT'];
150 150 if ( strpos( strtoupper( $browser), 'MSIE') !== false) {
151   - $oUrlEncodedFileName = rawurlencode( $oUrlEncodedFileName);
  151 + $oUrlEncodedFileName = htmlentities($oUrlEncodedFileName, ENT_QUOTES, 'UTF-8');
152 152 }
153 153 //set the correct headers
154 154 header("Content-Type: " . $mimetype);
... ...
plugins/rssplugin/KTrss.inc.php
  View file @f6ed52d
... ... @@ -293,7 +293,7 @@ class KTrss{
293 293 $sTypeSelect = 'document.transactionhistory&fDocumentId';
294 294 }
295 295 $feed .= "<item>\n" .
296   - "<title>".KTrss::rss_sanitize($aItems[0][0][name],false)."</title>\n" .
  296 + "<title>".htmlentities(KTrss::rss_sanitize($aItems[0][0][name],false), ENT_QUOTES, 'UTF-8')."</title>\n" .
297 297 "<link>".$hostPath."action.php?kt_path_info=ktcore.actions.".$sTypeSelect."=".$aItems[0][0]['id']."</link>\n" .
298 298 "<description>\n" .
299 299 "&lt;table border='0' width='90%'&gt;\n".
... ... @@ -309,7 +309,7 @@ class KTrss{
309 309 "&lt;hr&gt;\n".
310 310 "&lt;table width='95%'&gt;\n".
311 311 "&lt;tr&gt;\n".
312   - "&lt;td&gt;Filename: ".KTrss::rss_sanitize($aItems[0][0][filename] )."&lt;/td&gt;\n".
  312 + "&lt;td&gt;Filename: ".KTrss::rss_sanitize($aItems[0][0][filename])."&lt;/td&gt;\n".
313 313 "&lt;td&gt;\n".
314 314 "&lt;/tr&gt;\n".
315 315 "&lt;tr&gt;\n".
... ...
plugins/rssplugin/templates/RSSPlugin/dashlet.smarty
  View file @f6ed52d
... ... @@ -26,7 +26,7 @@
26 26 <table width='90%'>
27 27 {section name=i start=0 loop=$itemcount}
28 28 <tr>
29   - <td><strong><a href='{$internalrss.items[i].link}'>{$internalrss.items[i].title|sanitize}</a><strong></td>
  29 + <td><strong><a href='{$internalrss.items[i].link}'>{$internalrss.items[i].title}</a><strong></td>
30 30 </tr>
31 31 <tr>
32 32 <td>{$internalrss.items[i].description}</td>
... ...