Index: filter.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter/filter.module,v
retrieving revision 1.327
diff -u -p -r1.327 filter.module
--- filter.module	13 Apr 2010 15:23:03 -0000	1.327
+++ filter.module	24 Apr 2010 09:02:02 -0000
@@ -999,11 +999,11 @@ function _filter_tips($format_id, $long 
 
   foreach ($formats as $format) {
     $filters = filter_list_format($format->format);
-    $tips[$format->name] = array();
+    $tips[check_plain($format->name)] = array();
     foreach ($filters as $name => $filter) {
       if ($filter->status && isset($filter_info[$name]['tips callback']) && function_exists($filter_info[$name]['tips callback'])) {
         $tip = $filter_info[$name]['tips callback']($filter, $format, $long);
-        $tips[$format->name][$name] = array('tip' => $tip, 'id' => $name);
+        $tips[check_plain($format->name)][$name] = array('tip' => $tip, 'id' => $name);
       }
     }
   }
@@ -1119,7 +1119,7 @@ function theme_filter_tips_more_info() {
 function theme_filter_guidelines($variables) {
   $format = $variables['format'];
 
-  $name = isset($format->name) ? '<label>' . $format->name . ':</label>' : '';
+  $name = isset($format->name) ? '<label>' . check_plain($format->name) . ':</label>' : '';
   return '<div id="filter-guidelines-' . $format->format . '" class="filter-guidelines-item">' . $name . theme('filter_tips', array('tips' => _filter_tips($format->format, FALSE))) . '</div>';
 }