Poll page pager is not node access aware

I am importing content from phpBB via the phpbb2drupal module. As part of this module, phpbb polls are migrated. In my current migration, there are 50+ polls.

When displaying polls via the poll.module, the standard pager query is set for 15 requests. As I have more than that migrated over, I should see the standard pager displayed.

I have traced this to the pager_query() call in the poll.module for the function poll_page(). This function sends a query to the via the pager_query() function (part of pager module). The pager (includes/pager.inc) attempts to run a query to obtain the record count of the query prepared in the poll module so as to determine the number of pager results to display.

As stated in the pager_query() function:

* Unfortunately, the rewrite rule does not always work as intended for queries
* that already have a "COUNT(*)" or a "GROUP BY" clause, and possibly for
* other complex queries. In those cases, you can optionally pass a query that
* will be used to count the records.
*
* For example, if you want to page the query "SELECT COUNT(*), TYPE FROM node
* GROUP BY TYPE", pager_query() would invoke the incorrect query "SELECT
* COUNT(*) FROM node GROUP BY TYPE". So instead, you should pass "SELECT
* COUNT(DISTINCT(TYPE)) FROM node" as the optional $count_query parameter.

The query passed to pager_query() inside the poll_page() function does in fact include a GROUP BY query. The result is that the query that pager_query() uses to attempt to get the total record count does not return the desired results.

pager_query() has an optional function parameter used to replace the standard record COUNT query in pager_query(). If this parameter is sent in the poll_page() function in poll.module, the pager will work as expected.

In poll.module, I made the following changes to poll_page(). The pager now displays as expected.

$count_query = "SELECT COUNT(*) FROM {node} n INNER JOIN {poll} p ON n.nid = p.nid WHERE n.status = 1 AND n.moderate = 0";
$count_query = db_rewrite_sql($count_query);
$result = pager_query($sql, 15, 0, $count_query);