Index: contributions/modules/akismet/akismet.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/akismet/akismet.module,v
retrieving revision 1.18
diff -u -p -u -r1.18 akismet.module
--- contributions/modules/akismet/akismet.module	1 Jun 2007 22:20:40 -0000	1.18
+++ contributions/modules/akismet/akismet.module	1 Aug 2007 20:30:11 -0000
@@ -378,8 +378,9 @@ function akismet_nodeapi(&$node, $op, $t
         break;
       }
 
-      // Also quit asap, if current user has administration permission.
-      if (akismet_is_spam_moderator($node->type)) {
+      // Also quit asap, if current user has administration permission
+      // or permission to post without spam checking.
+      if (akismet_is_spam_moderator($node->type) || user_access('post with no akismet checking')) {
         akismet_notify_moderators('node', $node, ($node->status ? TRUE : FALSE), FALSE);
         break;
       }
@@ -415,15 +416,14 @@ function akismet_nodeapi(&$node, $op, $t
         }
 
         // Since users won't see their content published, show them a polite explanation on why.
-        $content_type_name = node_get_name($node);
-        drupal_set_message(t('Your %content-type-name has been queued for moderation by site administrators and will be published after approval.', array('%content-type-name' => $content_type_name)));
+        drupal_set_message(t('Your %content-type-name has been queued for moderation by site administrators and will be published after approval.', array('%content-type-name' => $node->type)));
 
         // Record the event to watchdog.
         if ($akismet_api_result == AKISMET_API_RESULT_ERROR) {
-          watchdog('content', t('Akismet service seems to be down, %content-type-name queued for manual approval: %title', array('%content-type-name' => $content_type_name, '%title' => $node->title)), WATCHDOG_WARNING, l(t('view'), 'node/'. $node->nid));
+          watchdog('content', t('Akismet service seems to be down, %content-type-name queued for manual approval: %title', array('%content-type-name' => $node->type, '%title' => $node->title)), WATCHDOG_WARNING, l(t('view'), 'node/'. $node->nid));
         }
         else {
-          watchdog('content', t('Spam detected by Akismet in %content-type-name: %title', array('%content-type-name' => $content_type_name, '%title' => $node->title)), WATCHDOG_WARNING, l(t('view'), 'node/'. $node->nid));
+          watchdog('content', t('Spam detected by Akismet in %content-type-name: %title', array('%content-type-name' => $node->type, '%title' => $node->title)), WATCHDOG_WARNING, l(t('view'), 'node/'. $node->nid));
           // If requested to, generate a delay so the spammer has to wait for a while.
           if (($seconds = variable_get('akismet_antispambot_delay', 60)) > 0) {
             sleep($seconds);