Index: advpoll.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/advpoll/advpoll.module,v
retrieving revision 1.21.2.84
diff -u -p -r1.21.2.84 advpoll.module
--- advpoll.module	8 Dec 2007 19:48:21 -0000	1.21.2.84
+++ advpoll.module	8 Dec 2007 20:38:07 -0000
@@ -1012,9 +1012,18 @@ function advpoll_votes_page() {
     $header[] = array('data' => t('Visitor'), 'field' => 'u.name');
     $header[] = array('data' => t('Vote'), '');
 
-    $result = pager_query("SELECT v.value, v.uid, v.hostname, v.tag, u.name FROM {votingapi_vote} v LEFT JOIN {users} u ON v.uid = u.uid WHERE v.content_type = 'advpoll' AND v.content_id = %d". tablesort_sql($header), 20, 0, NULL, $node->nid);
-    $rows = array();
+    $result = pager_query("SELECT v.vote_id, v.uid, v.hostname, u.name FROM {votingapi_vote} v LEFT JOIN {users} u ON v.uid = u.uid WHERE v.content_type = 'advpoll' AND v.content_id = %d GROUP BY v.vote_id". tablesort_sql($header), 20, 0, NULL, $node->nid);
+    $vote_ids = array();
+    $votes = array();
     while ($vote = db_fetch_object($result)) {
+      $vote_ids[] = $vote->vote_id;
+      $votes[$vote->vote_id] = $vote;
+    }
+    $result = db_query('SELECT vote_id, tag FROM {votingapi_vote} WHERE vote_id IN(%s) ORDER BY vote_id', implode(', ', $vote_ids));
+    $rows = array();
+    while ($vote_id = db_fetch_object($result)) {
+      $vote = $votes[$vote_id->vote_id];
+      $vote->tag = $vote_id->tag;
       $key = $vote->uid ? $vote->uid : $vote->hostname;
       $rows[$key]['name'] = $vote->name ? theme('username', $vote) : check_plain($vote->hostname);
       if ($node->type == 'advpoll_ranking') {