Index: mollom.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/mollom/mollom.admin.inc,v
retrieving revision 1.26
diff -u -p -r1.26 mollom.admin.inc
--- mollom.admin.inc	3 Jun 2010 18:41:15 -0000	1.26
+++ mollom.admin.inc	15 Jul 2010 20:52:14 -0000
@@ -525,15 +525,15 @@ function mollom_admin_settings($form, &$
     '#description' => t('Displays a link to the recommended <a href="@privacy-policy-url">privacy policy on mollom.com</a> on all forms that are protected via <a href="@help-url">textual analysis</a>. When disabling this option, you are required to inform visitors about data privacy through other means, as stated in the <a href="@terms-of-service-url">terms of service</a> applying to your subscription.', array(
       '@privacy-policy-url' => 'http://mollom.com/web-service-privacy-policy',
       '@help-url' => url('admin/help/mollom'),
-      '@terms-of-service-url' => 'http://mollom.com/terms-of-service')),
+      '@terms-of-service-url' => 'http://mollom.com/terms-of-service',
+    )),
   );
 
-  $form['mollom_developer_mode'] = array(
+  $form['mollom_testing_mode'] = array(
     '#type' => 'checkbox',
-    '#title' => t("Activate developer mode"),
-    '#return_value' => 1,
-    '#default_value' => variable_get('mollom_developer_mode', 0),
-    '#description' => t("Allows Mollom to be tested. When developer mode is activated, you can type 'ham', 'unsure' or 'spam' in the post body of a Mollom protected form to trigger the corresponding Mollom behavior. When enabling this option, Mollom stops working correctly so it should never be used in production environments."),
+    '#title' => t('Enable testing mode'),
+    '#default_value' => variable_get('mollom_testing_mode', 0),
+    '#description' => t('Submitting "ham", "unsure", or "spam" on a protected form will trigger the corresponding behavior, and similarly, word verifications will only respond to "correct" and "incorrect", instead of the actual characters asked for. This option should be disabled in production environments.'),
   );
 
   return system_settings_form($form);
Index: mollom.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/mollom/mollom.module,v
retrieving revision 1.48
diff -u -p -r1.48 mollom.module
--- mollom.module	9 Jul 2010 13:01:56 -0000	1.48
+++ mollom.module	15 Jul 2010 20:47:56 -0000
@@ -319,7 +319,7 @@ function mollom_init() {
       }
     }
     else {
-      if (variable_get('mollom_developer_mode', 0) == 1) {
+      if (variable_get('mollom_testing_mode', 0) == 1) {
         drupal_set_message(t('Mollom developer mode is still enabled. Visit the <a href="@settings-url">Mollom settings page</a> to disable developer mode.', array('@settings-url' => url('admin/config/content/mollom/settings'))), 'warning');
       }
     }
@@ -1364,14 +1364,14 @@ function mollom($method, $data = array()
   // Initialize refresh variable.
   $refresh = FALSE;
 
-  // Retrieve the list of Mollom servers from the database.
-  $servers = variable_get('mollom_servers', array());
-
   // Enable testing mode.
-  if (variable_get('mollom_developer_mode', 0) == 1) {
+  if (variable_get('mollom_testing_mode', 0)) {
     $data['testing'] = TRUE;
   }
 
+  // Retrieve the list of Mollom servers from the database.
+  $servers = variable_get('mollom_servers', array());
+
   if (empty($servers)) {
     // Retrieve a new list of servers.
     $servers = _mollom_retrieve_server_list();
Index: tests/mollom.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/mollom/tests/mollom.test,v
retrieving revision 1.35
diff -u -p -r1.35 mollom.test
--- tests/mollom.test	30 Jun 2010 18:51:35 -0000	1.35
+++ tests/mollom.test	15 Jul 2010 20:47:56 -0000
@@ -242,8 +242,8 @@ class MollomWebTestCase extends DrupalWe
     variable_set('mollom_public_key', $public);
     variable_set('mollom_private_key', $private);
 
-    // Set the Mollom keys in developer mode.
-    variable_set('mollom_developer_mode', 1);
+    // Enable testing mode.
+    variable_set('mollom_testing_mode', 1);
 
     // Delete any previously set Mollom servers to make sure we are using
     // the default ones.
@@ -720,7 +720,7 @@ class MollomInstallationTestCase extends
     $edit = array(
       'mollom_public_key' => MOLLOM_TEST_PUBLIC_KEY,
       'mollom_private_key' => MOLLOM_TEST_PRIVATE_KEY,
-      'mollom_developer_mode' => 1,
+      'mollom_testing_mode' => 1,
     );
     $this->drupalPost('admin/config/content/mollom/settings', $edit, t('Save configuration'), array('watchdog' => FALSE));
     $this->assertText(t('The configuration options have been saved.'));