Index: select.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/components/select.inc,v
retrieving revision 1.18.2.22
diff -u -r1.18.2.22 select.inc
--- select.inc	1 Feb 2008 02:12:56 -0000	1.18.2.22
+++ select.inc	1 Feb 2008 04:19:53 -0000
@@ -80,7 +80,7 @@
   );
 
   // Convert the user-entered options list into an array.
-  $default_value = _webform_filtervalues($component['value']);
+  $default_value = _webform_filtervalues($component['value'], FALSE);
   $rows = explode("\n", _webform_filtervalues($component['extra']['items'], FALSE));
 
   if ($component['extra']['aslist'] == 'Y' && $component['extra']['multiple'] != 'Y') {
@@ -215,8 +215,8 @@
  *   Nothing.
  */
 function _webform_submit_select(&$data, $component) {
-  $value = _webform_filtervalues($component['value']);
-  $rows = explode("\n", _webform_filtervalues($component['extra']['items']));
+  $value = _webform_filtervalues($component['value'], FALSE);
+  $rows = explode("\n", _webform_filtervalues($component['extra']['items'], FALSE));
 
   foreach ($rows as $row) {
     $row = trim($row);
@@ -256,7 +256,7 @@
  */
 function theme_webform_mail_select($data, $component) {
   // Convert submitted 'safe' values to un-edited, original form.
-  $rows = explode("\n", _webform_filtervalues($component['extra']['items']));
+  $rows = explode("\n", _webform_filtervalues($component['extra']['items'], FALSE));
   $options = array();
 
   foreach ($rows as $row) {
@@ -312,7 +312,7 @@
  *   submissions.
  */
 function _webform_analysis_rows_select($component) {
-  $rows = explode("\n", _webform_filtervalues($component['extra']['items']));
+  $rows = explode("\n", _webform_filtervalues($component['extra']['items'], FALSE));
   $options = array();
 
   foreach ($rows as $row) {
@@ -421,8 +421,8 @@
  *   commas.
  */
 function _webform_csv_data_select($data, $component) {
-  $value = _webform_filtervalues($component['value']);
-  $rows = explode("\n", _webform_filtervalues($component['extra']['items']));
+  $value = _webform_filtervalues($component['value'], FALSE);
+  $rows = explode("\n", _webform_filtervalues($component['extra']['items'], FALSE));
   $options = array();
 
   foreach ($rows as $row) {
@@ -437,7 +437,7 @@
 
   if ($component['extra']['multiple']) {
     foreach ($options as $key => $item) {
-      if (in_array($item, (array)$data['value']) === true) {
+      if (in_array($item, (array)$data['value']) === true || in_array($key, (array)$data['value']) === true) {
         $output .= '\,Yes';
       }
       else {