Index: mollom.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/mollom/mollom.admin.inc,v
retrieving revision 1.28
diff -u -p -r1.28 mollom.admin.inc
--- mollom.admin.inc	28 Jul 2010 21:00:52 -0000	1.28
+++ mollom.admin.inc	2 Aug 2010 20:48:23 -0000
@@ -529,6 +529,24 @@ function mollom_admin_settings($form, &$
     )),
   );
 
+  $form['mollom_captcha_types'] = array(
+    '#type' => 'checkboxes',
+    '#title' => t('Verification tools to challenge humans'),
+    '#options' => array(
+      'image' => t('Image CAPTCHA'),
+      'audio' => t('Audio CAPTCHA'),
+    ),
+    '#default_value' => variable_get('mollom_captcha_types', array('image', 'audio')),
+    // Image CAPTCHA is required and cannot be disabled.
+    'image' => array(
+      '#type' => 'checkbox',
+      '#title' => t('Image CAPTCHA'),
+      '#return_value' => 'image',
+      '#value' => 'image',
+      '#disabled' => TRUE,
+    ),
+  );
+
   $form['mollom_testing_mode'] = array(
     '#type' => 'checkbox',
     '#title' => t('Enable testing mode'),
Index: mollom.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/mollom/mollom.module,v
retrieving revision 1.61
diff -u -p -r1.61 mollom.module
--- mollom.module	1 Aug 2010 23:12:32 -0000	1.61
+++ mollom.module	2 Aug 2010 20:49:38 -0000
@@ -1637,6 +1637,7 @@ function mollom_get_captcha($type, array
   $data += array(
     'author_ip' => ip_address(),
     'ssl' => isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on',
+    'language' => $GLOBALS['language_content'],
   );
 
   // @todo Convert these to actual theme functions?