- Patch #302268 by Berdir, Dave Reid, tizzo, Ryan Palmer: TableSort and PagerQueries broken.

1 files changed, 4 insertions, 6 deletions

diff --git a/modules/poll/poll.pages.inc b/modules/poll/poll.pages.inc
index ebd12cbe9..7a23597b6 100644
--- a/modules/poll/poll.pages.inc
+++ b/modules/poll/poll.pages.inc
@@ -58,19 +58,17 @@ function poll_votes($node) {
   $header[] = array('data' => t('Vote'), 'field' => 'pc.chtext');
   $header[] = array('data' => t('Timestamp'), 'field' => 'pv.timestamp', 'sort' => 'desc');
 
-  $select = db_select('poll_vote', 'pv');
+  $select = db_select('poll_vote', 'pv')->extend('PagerDefault')->extend('TableSort');
   $select->join('poll_choice', 'pc', 'pv.chid = pc.chid');
   $select->join('users', 'u', 'pv.uid = u.uid');
-  $queried_votes = $select->fields('pv', array('chid', 'uid', 'hostname', 'timestamp', 'nid'))
+  $queried_votes = $select
+    ->fields('pv', array('chid', 'uid', 'hostname', 'timestamp', 'nid'))
     ->fields('pc', array('chtext'))
     ->fields('u', array('name'))
     ->condition('pv.nid', $node->nid)
-    ->extend('PagerDefault')
     ->limit($votes_per_page)
-    ->extend('TableSort')
     ->orderByHeader($header)
-    ->execute()
-    ->fetchAllAssoc('hostname');
+    ->execute();
 
   $rows = array();
   foreach ($queried_votes as $vote) {