Index: modules/aggregator.module =================================================================== RCS file: /cvs/drupal/drupal/modules/aggregator.module,v retrieving revision 1.246 diff -u -F^f -r1.246 aggregator.module --- modules/aggregator.module 11 Aug 2005 13:12:44 -0000 1.246 +++ modules/aggregator.module 13 Aug 2005 01:16:10 -0000 @@ -985,9 +986,7 @@ function _aggregator_page_list($sql, $op } $output .= ''; - if ($pager = theme('pager', NULL, 20, 0)) { - $output .= $pager; - } + $output .= theme('pager', NULL, 20, 0); return $output; } Index: modules/comment.module =================================================================== RCS file: /cvs/drupal/drupal/modules/comment.module,v retrieving revision 1.364 diff -u -F^f -r1.364 comment.module --- modules/comment.module 1 Aug 2005 05:14:05 -0000 1.364 +++ modules/comment.module 13 Aug 2005 01:16:11 -0000 @@ -932,9 +932,7 @@ function comment_render($node, $cid = 0) // Use the standard pager; $pager_total is the number of returned rows, // is global and defined in pager.inc. - if ($pager = theme('pager', NULL, $comments_per_page, 0, array('comments_per_page' => $comments_per_page))) { - $output .= $pager; - } + $output .= theme('pager', NULL, $comments_per_page, 0, array('comments_per_page' => $comments_per_page)); if (db_num_rows($result) && comment_user_can_moderate($node)) { $output .= '
'; Index: modules/forum.module =================================================================== RCS file: /cvs/drupal/drupal/modules/forum.module,v retrieving revision 1.260 diff -u -F^f -r1.260 forum.module --- modules/forum.module 1 Aug 2005 05:14:05 -0000 1.260 +++ modules/forum.module 13 Aug 2005 01:16:11 -0000 @@ -927,13 +936,10 @@ function theme_forum_topic_list($tid, $t ); } } - - if ($pager = theme('pager', NULL, $forum_per_page, 0, tablesort_pager())) { - $rows[] = array(array('data' => $pager, 'colspan' => '5', 'class' => 'pager')); - } } $output .= theme('table', $forum_topic_list_header, $rows); + $output .= theme('pager', NULL, $forum_per_page, 0, tablesort_pager()); return $output; } Index: modules/node.module =================================================================== RCS file: /cvs/drupal/drupal/modules/node.module,v retrieving revision 1.519 diff -u -F^f -r1.519 node.module --- modules/node.module 11 Aug 2005 12:53:39 -0000 1.519 +++ modules/node.module 13 Aug 2005 01:16:12 -0000 @@ -918,15 +918,12 @@ function node_admin_nodes() { l(t('edit'), 'node/'. $node->nid .'/edit', array(), $destination)); } - if ($pager = theme('pager', NULL, 50, 0)) { - $rows[] = array(array('data' => $pager, 'colspan' => '7')); - } - if (!$rows) { $rows[] = array(array('data' => t('No posts available.'), 'colspan' => '6')); } $output .= theme('table', $header, $rows); + $output .= theme('pager', NULL, 50, 0); return form($output, 'post', url('admin/node/action')); } Index: modules/path.module =================================================================== RCS file: /cvs/drupal/drupal/modules/path.module,v retrieving revision 1.61 diff -u -F^f -r1.61 path.module --- modules/path.module 11 Aug 2005 13:02:08 -0000 1.61 +++ modules/path.module 13 Aug 2005 01:16:12 -0000 @@ -269,15 +269,13 @@ function path_overview() { $rows[] = array($data->dst, $data->src, l(t('edit'), "admin/path/edit/$data->pid", array(), $destination), l(t('delete'), "admin/path/delete/$data->pid", array(), $destination)); } - if ($pager = theme('pager', NULL, 50, 0, tablesort_pager())) { - $rows[] = array(array('data' => $pager, 'colspan' => '4')); - } - if (!$rows) { $rows[] = array(array('data' => t('No URL aliases available.'), 'colspan' => '4')); } - return theme('table', $header, $rows); + $output = theme('table', $header, $rows); + $output .= theme('pager', NULL, 50, 0, tablesort_pager()); + return $output; } /** Index: modules/statistics.module =================================================================== RCS file: /cvs/drupal/drupal/modules/statistics.module,v retrieving revision 1.202 diff -u -F^f -r1.202 statistics.module --- modules/statistics.module 1 Aug 2005 05:14:05 -0000 1.202 +++ modules/statistics.module 13 Aug 2005 01:16:12 -0000 @@ -177,12 +177,10 @@ function statistics_node_tracker() { l(t('details'), "admin/logs/access/$log->aid")); } - if ($pager = theme('pager', NULL, 30, 0, tablesort_pager())) { - $rows[] = array(array('data' => $pager, 'colspan' => '4')); - } - drupal_set_title(check_plain($node->title)); - return theme('table', $header, $rows); + $output = theme('table', $header, $rows); + $output .= theme('pager', NULL, 30, 0, tablesort_pager()); + return $output; } else { drupal_not_found(); @@ -205,12 +203,10 @@ function statistics_user_tracker() { l(t('details'), "admin/logs/access/$log->aid")); } - if ($pager = theme('pager', NULL, 30, 0, tablesort_pager())) { - $rows[] = array(array('data' => $pager, 'colspan' => '3')); - } - drupal_set_title($account->name); - return theme('table', $header, $rows); + $output = theme('table', $header, $rows); + $output .= theme('pager', NULL, 30, 0, tablesort_pager()); + return $output; } else { drupal_not_found(); @@ -239,11 +235,9 @@ function statistics_recent_hits($type = l(t('details'), "admin/logs/access/$log->aid")); } - if ($pager = theme('pager', NULL, 30, 0, tablesort_pager())) { - $rows[] = array(array('data' => $pager, 'colspan' => '4')); - } - - return theme('table', $header, $rows); + $output = theme('table', $header, $rows); + $output .= theme('pager', NULL, 30, 0, tablesort_pager()); + return $output; } /** @@ -266,12 +260,10 @@ function statistics_top_pages() { $rows[] = array($page->hits, _statistics_format_item($page->title, $page->path), t('%time ms', array('%time' => round($page->average_time))), format_interval(round($page->total_time / 1000))); } - if ($pager = theme('pager', NULL, 30, 0, tablesort_pager())) { - $rows[] = array(array('data' => $pager, 'colspan' => '4')); - } - drupal_set_title(t('Top pages in the past %interval', array('%interval' => format_interval(variable_get('statistics_flush_accesslog_timer', 259200))))); - return theme('table', $header, $rows); + $output = theme('table', $header, $rows); + $output .= theme('pager', NULL, 30, 0, tablesort_pager()); + return $output; } /** @@ -296,12 +288,10 @@ function statistics_top_visitors() { $rows[] = array($account->hits, ($account->uid ? theme('username', $account) : $account->hostname), format_interval(round($account->total / 1000)), $ban_link); } - if ($pager = theme('pager', NULL, 30, 0, tablesort_pager())) { - $rows[] = array(array('data' => $pager, 'colspan' => '4')); - } - drupal_set_title(t('Top visitors in the past %interval', array('%interval' => format_interval(variable_get('statistics_flush_accesslog_timer', 259200))))); - return theme('table', $header, $rows); + $output = theme('table', $header, $rows); + $output .= theme('pager', NULL, 30, 0, tablesort_pager()); + return $output; } /** @@ -324,11 +314,10 @@ function statistics_top_referrers() { while ($referrer = db_fetch_object($result)) { $rows[] = array($referrer->hits, ''. check_plain(_statistics_column_width($referrer->url)) .'', t('%time ago', array('%time' => format_interval(time() - $referrer->last)))); } - if ($pager = theme('pager', NULL, 30, 0, tablesort_pager())) { - $rows[] = array(array('data' => $pager, 'colspan' => '3')); - } - return theme('table', $header, $rows); + $output = theme('table', $header, $rows); + $output .= theme('pager', NULL, 30, 0, tablesort_pager()); + return $output; } /** Index: modules/user.module =================================================================== RCS file: /cvs/drupal/drupal/modules/user.module,v retrieving revision 1.501 diff -u -F^f -r1.501 user.module --- modules/user.module 11 Aug 2005 13:52:44 -0000 1.501 +++ modules/user.module 13 Aug 2005 01:16:13 -0000 @@ -1730,11 +1727,9 @@ function user_admin_account() { l(t('edit'), "user/$account->uid/edit", array(), $destination)); } - $pager = theme('pager', NULL, 50, 0, tablesort_pager()); - if (!empty($pager)) { - $rows[] = array(array('data' => $pager, 'colspan' => '5')); - } - return theme('table', $header, $rows); + $output = theme('table', $header, $rows); + $output .= theme('pager', NULL, 50, 0, tablesort_pager()); + return $output; } function user_configure() { Index: modules/watchdog.module =================================================================== RCS file: /cvs/drupal/drupal/modules/watchdog.module,v retrieving revision 1.125 diff -u -F^f -r1.125 watchdog.module --- modules/watchdog.module 6 Aug 2005 00:35:38 -0000 1.125 +++ modules/watchdog.module 13 Aug 2005 01:16:13 -0000 @@ -117,13 +117,9 @@ function watchdog_overview() { $rows[] = array(array('data' => t('No log messages available.'), 'colspan' => '7')); } - $pager = theme('pager', NULL, 50, 0, tablesort_pager()); - if (!empty($pager)) { - $rows[] = array(array('data' => $pager, 'colspan' => '7')); - } - $output = '