? .svn
? LICENSE.txt
? mollom.patch
Index: mollom.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/mollom/mollom.module,v
retrieving revision 1.1.2.18
diff -u -p -r1.1.2.18 mollom.module
--- mollom.module	2 Jul 2008 21:35:49 -0000	1.1.2.18
+++ mollom.module	4 Jul 2008 13:25:32 -0000
@@ -522,7 +522,7 @@ function mollom_validate($form_id, $form
   // Retreive the mode of protection that is required for this form:
   $mode = _mollom_get_mode($form_id);
   if ($mode == MOLLOM_MODE_ANALYSIS) {
-    mollom_protect_form_analysis($form_values, $data);
+    mollom_protect_form_analysis($data);
   }
   else if ($mode == MOLLOM_MODE_CAPTCHA) {
     mollom_protect_form_captcha($form_values, $data);
@@ -706,12 +706,13 @@ function _mollom_fallback() {
   if ($fallback == MOLLOM_FALLBACK_BLOCK) {
     form_set_error('mollom', t("The spam filter that is installed on this site is currently not available. Per the site's policy, we are unable to accept new submissions until that problem is resolved. Please try resubmitting the form in a couple minutes."));
   }
-      
+
   watchdog('mollom', t('Mollom was unavailable (error: @errno - %error_msg)', array('@errno' => xmlrpc_errno(), '%error_msg' => xmlrpc_error_msg())), WATCHDOG_ERROR);
 }
 
-function mollom_protect_form_analysis(&$form, $data) {
-  if (isset($_POST['op'])) {
+function mollom_protect_form_analysis($data) {
+  global $form_button_counter, $form_submitted;
+  if ($form_submitted || (!$form_button_counter[0] && $form_button_counter[1])) {
     $mollom = $_POST['session-id'] ? array('session_id' => $_POST['session-id']) : array();
 
     $result = mollom('mollom.checkContent', $data + $mollom);