Index: sites/all/modules/webform/components/select.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/components/select.inc,v
retrieving revision 1.18.2.19.2.7
diff -u -r1.18.2.19.2.7 select.inc
--- sites/all/modules/webform/components/select.inc	1 Feb 2008 04:17:46 -0000	1.18.2.19.2.7
+++ sites/all/modules/webform/components/select.inc	10 Feb 2008 06:24:34 -0000
@@ -279,19 +279,24 @@
   // Generate the output.
   if ($component['extra']['multiple']) {
     $output = $component['name'] .":\n";
-    foreach ($data as $value) {
+    foreach ((array)$data as $value) {
       if ($value) {
         if ($options[$value]) {
           $output .= "    - ". $options[$value] ."\n";
         }
-        else {
+        elseif($options[_webform_safe_name($value)]) {
           $output .= "    - ". $options[_webform_safe_name($value)] ."\n";
         }
       }
     }
   }
   else {
-    $output = $component['name'] .": ". $options[_webform_safe_name($data)] ."\n";
+    if ($options[$data]) {
+      $output = $component['name'] .": ". $options[$data] ."\n";
+    }
+    elseif($options[_webform_safe_name($data)]) {
+      $output = $component['name'] .": ". $options[_webform_safe_name($data)] ."\n";
+    }
   }
   return $output;
 }
