Index: mollom.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/mollom/mollom.admin.inc,v
retrieving revision 1.35
diff -u -p -r1.35 mollom.admin.inc
--- mollom.admin.inc	14 Sep 2010 19:15:22 -0000	1.35
+++ mollom.admin.inc	14 Sep 2010 19:40:31 -0000
@@ -10,10 +10,7 @@
  * Menu callback; Displays a list of forms configured for Mollom.
  */
 function mollom_admin_form_list() {
-  // This page is no form, but we want the testing mode warning to appear on it,
-  // too. We therefore pretend there was a form.
-  $form = $form_state = array();
-  mollom_form_alter($form, $form_state, 'mollom_admin_form_list');
+  _mollom_testing_mode_warning();
 
   $modes = array(
     MOLLOM_MODE_DISABLED => t('None'),
Index: mollom.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/mollom/mollom.module,v
retrieving revision 1.77
diff -u -p -r1.77 mollom.module
--- mollom.module	14 Sep 2010 19:15:23 -0000	1.77
+++ mollom.module	14 Sep 2010 19:42:30 -0000
@@ -594,20 +594,8 @@ function mollom_form_alter(&$form, &$for
   }
 
   // Remind of enabled testing mode on all protected forms.
-  if (!isset($forms['testing']) && variable_get('mollom_testing_mode', 0) && empty($_POST) && (isset($forms['protected'][$form_id]) || strpos($_GET['q'], 'admin/config/content/mollom') === 0)) {
-    // Re-use the static form cache variable to only output this warning once.
-    $forms['testing'] = TRUE;
-
-    $admin_message = '';
-    if (user_access('administer mollom') && $_GET['q'] != 'admin/config/content/mollom/settings') {
-      $admin_message = t('Visit the <a href="@settings-url">Mollom settings page</a> to disable it.', array(
-        '@settings-url' => url('admin/config/content/mollom/settings'),
-      ));
-    }
-    $message = t('Mollom testing mode is still enabled. !admin-message', array(
-      '!admin-message' => $admin_message,
-    ));
-    drupal_set_message($message, 'warning');
+  if (isset($forms['protected'][$form_id]) || strpos($_GET['q'], 'admin/config/content/mollom') === 0) {
+    _mollom_testing_mode_warning();
   }
 
   // Site administrators don't have their content checked with Mollom.
@@ -1115,6 +1103,30 @@ function _mollom_status($reset = FALSE) 
 }
 
 /**
+ * Outputs a warning message about enabled testing mode (once).
+ */
+function _mollom_testing_mode_warning() {
+  $warned = &drupal_static(__FUNCTION__);
+  if (isset($warned)) {
+    return;
+  }
+  $warned = TRUE;
+
+  if (variable_get('mollom_testing_mode', 0) && empty($_POST)) {
+    $admin_message = '';
+    if (user_access('administer mollom') && $_GET['q'] != 'admin/config/content/mollom/settings') {
+      $admin_message = t('Visit the <a href="@settings-url">Mollom settings page</a> to disable it.', array(
+        '@settings-url' => url('admin/config/content/mollom/settings'),
+      ));
+    }
+    $message = t('Mollom testing mode is still enabled. !admin-message', array(
+      '!admin-message' => $admin_message,
+    ));
+    drupal_set_message($message, 'warning');
+  }
+}
+
+/**
  * Helper function to log and optionally output an error message when Mollom servers are unavailable.
  */
 function _mollom_fallback() {