Index: modules/poll/poll.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/poll/poll.module,v
retrieving revision 1.338
diff -u -p -r1.338 poll.module
--- modules/poll/poll.module	2 Feb 2010 07:39:21 -0000	1.338
+++ modules/poll/poll.module	3 Feb 2010 14:19:58 -0000
@@ -483,7 +483,7 @@ function poll_load($nodes) {
         $result = db_query('SELECT chid FROM {poll_vote} WHERE nid = :nid AND uid = :uid', array(':nid' => $node->nid, ':uid' => $user->uid))->fetchObject();
       }
       else {
-        $result = db_query("SELECT chid FROM {poll_vote} WHERE nid = :nid AND hostname = :hostname", array(':nid' => $node->nid, ':hostname' => ip_address()))->fetchObject();
+        $result = db_query("SELECT chid FROM {poll_vote} WHERE nid = :nid AND hostname = :hostname AND uid = 0", array(':nid' => $node->nid, ':hostname' => ip_address()))->fetchObject();
       }
       if ($result) {
         $poll->vote = $result->chid;
@@ -720,7 +720,7 @@ function poll_vote($form, &$form_state) 
       'nid' => $node->nid,
       'chid' => $choice,
       'uid' => $user->uid,
-      'hostname' => $user->uid ? '' : ip_address(),
+      'hostname' => ip_address(),
       'timestamp' => REQUEST_TIME,
     ))
     ->execute();