Index: components/select.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/components/select.inc,v
retrieving revision 1.39.2.2
diff -u -r1.39.2.2 select.inc
--- components/select.inc	8 Mar 2010 01:04:08 -0000	1.39.2.2
+++ components/select.inc	11 Mar 2010 00:54:11 -0000
@@ -213,7 +213,7 @@
   if ($component['extra']['other_option'] === 'Y' && module_exists('select_or_other')) {
     // Set display as a select list:
     $element['#type'] = 'select_or_other';
-    $element['#other'] = empty($component['extra']['other_text']) ? $component['extra']['other_text'] : t('Other...');
+    $element['#other'] = !empty($component['extra']['other_text']) ? check_plain($component['extra']['other_text']) : t('Other...');
     $element['#other_unknown_defaults'] = 'other';
     $element['#other_delimiter'] = ', ';
     if ($component['extra']['multiple'] === 'Y') {
@@ -552,14 +552,14 @@
     foreach (array_intersect_key($options, $rows) as $key => $label) {
       $ordered_rows[] = $rows[$key];
     }
-  
+
     // Add a row for any unknown or user-entered values.
     if ($component['extra']['other_option'] === 'Y') {
       $full_count = db_result(db_query($count_query, array_merge(array($component['nid'], $component['cid']), $sids)));
       $other_count = $full_count - $normal_count;
-      $display_option = empty($component['extra']['other_text']) ? $component['extra']['other_text'] : t('Other...');
+      $display_option = !empty($component['extra']['other_text']) ? check_plain($component['extra']['other_text']) : t('Other...');
       $other_text = $other_count ? $other_count . ' (' . l(t('view'), 'node/' . $component['nid'] . '/webform-results/analysis/' . $component['cid']) . ')' : $other_count;
-      $ordered_rows[] = array(check_plain($display_option), $other_text);
+      $ordered_rows[] = array($display_option, $other_text);
     }
 
     $rows = $ordered_rows;
@@ -602,7 +602,7 @@
     $headers[1][] = $component['name'];
     $items = _webform_select_options($component['extra']['items'], TRUE);
     if ($component['extra']['other_option'] === 'Y') {
-      $other_label = !empty($component['extra']['other_text']) ? $component['extra']['other_text'] : t('Other...');
+      $other_label = !empty($component['extra']['other_text']) ? check_plain($component['extra']['other_text']) : t('Other...');
       $items[$other_label] = $other_label;
     }
     $count = 0;