Index: mollom.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/mollom/mollom.module,v
retrieving revision 1.2.2.173
diff -u -p -r1.2.2.173 mollom.module
--- mollom.module	6 Oct 2010 23:55:31 -0000	1.2.2.173
+++ mollom.module	15 Oct 2010 11:40:57 -0000
@@ -998,23 +998,29 @@ function mollom_form_get_values($form_va
     // $mapping with the actual form element value, and continue to the next
     // field. Also unset this field from $exclude_fields, so we can process the
     // remaining mappings below.
-    if (isset($exclude_fields[$field]) && drupal_validate_utf8($value)) {
-      $mapping[$exclude_fields[$field]] = $value;
+    if (isset($exclude_fields[$field])) {
+      if (drupal_validate_utf8($value)) {
+        $mapping[$exclude_fields[$field]] = $value;
+      }
       unset($exclude_fields[$field]);
       continue;
     }
     // Only add form element values that are not empty.
     if (isset($value)) {
-      if (is_string($value) && drupal_validate_utf8($value) && drupal_strlen($value)) {
-        $post_body[$field] = $value;
+      if (is_string($value)) {
+        if (drupal_validate_utf8($value) && drupal_strlen($value)) {
+          $post_body[$field] = $value;
+        }
       }
       // Recurse into nested values (e.g. multiple value fields).
       elseif (!empty($value)) {
         // Ensure we have a flat array to implode(); form values of
         // field_attach_form() use several subkeys.
         _mollom_flatten_form_values($value);
-        if (($value = implode("\n", $value)) && drupal_validate_utf8($value)) {
-          $post_body[$field] = $value;
+        if ($value = implode("\n", $value)) {
+          if (drupal_validate_utf8($value)) {
+            $post_body[$field] = $value;
+          }
         }
       }
     }
@@ -1031,8 +1037,10 @@ function mollom_form_get_values($form_va
     foreach ($parents as $key) {
       $value = isset($value[$key]) ? $value[$key] : NULL;
     }
-    if (isset($value) && drupal_validate_utf8($value)) {
-      $mapping[$property] = $value;
+    if (isset($value)) {
+      if (drupal_validate_utf8($value)) {
+        $mapping[$property] = $value;
+      }
     }
   }
 
