Index: modules/poll.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/poll.module,v
retrieving revision 1.157
diff -u -r1.157 poll.module
--- modules/poll.module	12 Feb 2005 07:51:14 -0000	1.157
+++ modules/poll.module	9 Mar 2005 05:20:35 -0000
@@ -239,7 +239,7 @@
  */
 function poll_load($node) {
   // Load the appropriate choices into the $node object
-  $poll = db_fetch_object(db_query("SELECT runtime, voters, active FROM {poll} WHERE nid = %d", $node->nid));
+  $poll = db_fetch_object(db_query("SELECT runtime, voters AS polled, active FROM {poll} WHERE nid = %d", $node->nid));
 
   $result = db_query("SELECT chtext, chvotes, chorder FROM {poll_choices} WHERE nid=%d ORDER BY chorder", $node->nid);
   while ($choice = db_fetch_array($result)) {
@@ -249,7 +249,7 @@
   // Determine whether or not this user is allowed to vote
   $poll->allowvotes = false;
   if (user_access('vote on polls')) {
-    if (!strstr($poll->voters, poll_uid())) {
+    if (!strstr($poll->polled, poll_uid())) {
       $poll->allowvotes = $poll->active;
     }
   }
@@ -381,8 +381,8 @@
     if (isset($choice) && isset($node->choice[$choice])) {
       if ($node->allowvotes) {
         $id = poll_uid();
-        $node->voters = $node->voters ? ($node->voters .' '. $id) : $id;
-        db_query("UPDATE {poll} SET voters='%s' WHERE nid = %d", $node->voters, $node->nid);
+	$node->polled = $node->polled ? ($node->polled .' '. $id) : $id;
+	db_query("UPDATE {poll} SET voters='%s' WHERE nid = %d", $node->polled, $node->nid);
         db_query("UPDATE {poll_choices} SET chvotes = chvotes + 1 WHERE nid = %d AND chorder = %d", $node->nid, $choice);
         $node->allowvotes = false;
         $node->choice[$choice]['chvotes']++;