MDL-8922 Some Xhtml fixes, merged from MOODLE_18_STABLE

diff --git a/blocks/rss_client/block_rss_client.php b/blocks/rss_client/block_rss_client.php
index e290092fdda72d03fc3b562a3207620db3e3d871..8c57700d488e6e738724068b6f0af4f8be83b745 100644 (file)
--- a/blocks/rss_client/block_rss_client.php
+++ b/blocks/rss_client/block_rss_client.php
@@ -231,6 +231,7 @@
                 if ($item['link'] == '') {
                     $item['link'] = $item['guid'];
                 }
+                $item['title'] = s($item['title']);
 
                 $item['link'] = str_replace('&', '&', $item['link']);
 
@@ -276,10 +277,10 @@
          $textlib = textlib_get_instance();
 
          if ($textlib->strlen($title) <= $max) {
-             return $title;
+             return s($title);
          }
          else {
-             return $textlib->substr($title,0,$max-3).'...';
+             return s($textlib->substr($title,0,$max-3).'...');
          }
      }
 }