--- voting.module.cvs	2006-07-27 16:50:35.000000000 +0200
+++ voting.module	2006-07-27 16:45:38.000000000 +0200
@@ -398,16 +398,29 @@
         $node->voting = $voting->voting;
       } else {
         $node->voting = variable_get("voting_nodeapi_{$node->type}", 'never');
+        if ($node->voting == 'never' || $node->voting == 'sometimes') {
+          $node->voting = 0;
+        }
+        else {
+          $node->voting = 1;
+        }
       }
       if ($teaser && !variable_get('voting_show_in_teaser', 0)) {
         $node->voting = 0;
       }
       break;
-    case 'validate':
-      if (!user_access('administer nodes')) {
+    case 'submit':
+      if (!user_access('administer nodes') || !isset($node->voting) || !is_numeric($node->voting)) {
         // Force default (for this content type) for normal users:
-        $node->voting = variable_get('voting_' . $node->type, 0);
+        $node->voting = variable_get("voting_nodeapi_{$node->type}", 'never');
+        if ($node->voting == 'never' || $node->voting == 'sometimes') {
+          $node->voting = 0;
+        }
+        else {
+          $node->voting = 1;
+        }
       }
+    case 'validate':
 			voting_filter_validate($node);
       break; 
     case 'update':