';
while ($account = db_fetch_object($result)) {
@@ -464,7 +464,7 @@ function profile_browse() {
$profile = _profile_update_user_fields($fields, $account);
$output .= theme('profile_listing', $account, $profile);
}
- $output .= theme('pager', NULL, 20);
+ $output .= theme('pager', NULL, variable_get('admin_pager_normal', 30));
if ($field->type == 'selection' || $field->type == 'list' || $field->type == 'textfield') {
$title = strtr($field->page, array('%value' => theme('placeholder', $value)));
@@ -489,7 +489,7 @@ function profile_browse() {
}
// Extract the affected users:
- $result = pager_query("SELECT uid, access FROM {users} WHERE uid > 0 AND status != 0 ORDER BY access DESC", 20, 0, NULL);
+ $result = pager_query("SELECT uid, access FROM {users} WHERE uid > 0 AND status != 0 ORDER BY access DESC", variable_get('admin_pager_normal', 30), 0, NULL);
$output = '
';
while ($account = db_fetch_object($result)) {
@@ -498,7 +498,7 @@ function profile_browse() {
$output .= theme('profile_listing', $account, $profile);
}
$output .= '
';
- $output .= theme('pager', NULL, 20);
+ $output .= theme('pager', NULL, variable_get('admin_pager_normal', 30));
drupal_set_title(t('user list'));
return $output;
Index: modules/statistics.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/statistics.module,v
retrieving revision 1.228
diff -u -p -r1.228 statistics.module
--- modules/statistics.module 18 May 2006 14:58:57 -0000 1.228
+++ modules/statistics.module 24 May 2006 16:08:30 -0000
@@ -181,7 +181,7 @@ function statistics_node_tracker() {
array('data' => t('User'), 'field' => 'u.name'),
array('data' => t('Operations')));
- $result = pager_query('SELECT a.aid, a.timestamp, a.url, a.uid, u.name FROM {accesslog} a LEFT JOIN {users} u ON a.uid = u.uid WHERE a.path LIKE \'node/%d%%\'' . tablesort_sql($header), 30, 0, NULL, $node->nid);
+ $result = pager_query('SELECT a.aid, a.timestamp, a.url, a.uid, u.name FROM {accesslog} a LEFT JOIN {users} u ON a.uid = u.uid WHERE a.path LIKE \'node/%d%%\'' . tablesort_sql($header), variable_get('admin_pager_normal', 30), 0, NULL, $node->nid);
while ($log = db_fetch_object($result)) {
$rows[] = array(
array('data' => format_date($log->timestamp, 'small'), 'class' => 'nowrap'),
@@ -192,7 +192,7 @@ function statistics_node_tracker() {
drupal_set_title(check_plain($node->title));
$output = theme('table', $header, $rows);
- $output .= theme('pager', NULL, 30, 0);
+ $output .= theme('pager', NULL, variable_get('admin_pager_normal', 30), 0);
return $output;
}
else {
@@ -208,7 +208,7 @@ function statistics_user_tracker() {
array('data' => t('Page'), 'field' => 'path'),
array('data' => t('Operations')));
- $result = pager_query('SELECT aid, timestamp, path, title FROM {accesslog} WHERE uid = %d' . tablesort_sql($header), 30, 0, NULL, $account->uid);
+ $result = pager_query('SELECT aid, timestamp, path, title FROM {accesslog} WHERE uid = %d' . tablesort_sql($header), variable_get('admin_pager_normal', 30), 0, NULL, $account->uid);
while ($log = db_fetch_object($result)) {
$rows[] = array(
array('data' => format_date($log->timestamp, 'small'), 'class' => 'nowrap'),
@@ -218,7 +218,7 @@ function statistics_user_tracker() {
drupal_set_title($account->name);
$output = theme('table', $header, $rows);
- $output .= theme('pager', NULL, 30, 0);
+ $output .= theme('pager', NULL, variable_get('admin_pager_normal', 30), 0);
return $output;
}
else {
@@ -239,7 +239,7 @@ function statistics_recent_hits() {
$sql = 'SELECT a.aid, a.path, a.title, a.uid, u.name, a.timestamp FROM {accesslog} a LEFT JOIN {users} u ON u.uid = a.uid' . tablesort_sql($header);
- $result = pager_query($sql, 30);
+ $result = pager_query($sql, variable_get('admin_pager_normal', 30));
while ($log = db_fetch_object($result)) {
$rows[] = array(
array('data' => format_date($log->timestamp, 'small'), 'class' => 'nowrap'),
@@ -249,7 +249,7 @@ function statistics_recent_hits() {
}
$output = theme('table', $header, $rows);
- $output .= theme('pager', NULL, 30, 0);
+ $output .= theme('pager', NULL, variable_get('admin_pager_normal', 30), 0);
return $output;
}
@@ -267,7 +267,7 @@ function statistics_top_pages() {
array('data' => t('Total page generation time'), 'field' => 'total_time')
);
$sql .= tablesort_sql($header);
- $result = pager_query($sql, 30, 0, $sql_cnt);
+ $result = pager_query($sql, variable_get('admin_pager_normal', 30), 0, $sql_cnt);
while ($page = db_fetch_object($result)) {
$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)));
@@ -275,7 +275,7 @@ function statistics_top_pages() {
drupal_set_title(t('Top pages in the past %interval', array('%interval' => format_interval(variable_get('statistics_flush_accesslog_timer', 259200)))));
$output = theme('table', $header, $rows);
- $output .= theme('pager', NULL, 30, 0);
+ $output .= theme('pager', NULL, variable_get('admin_pager_normal', 30), 0);
return $output;
}
@@ -293,7 +293,7 @@ function statistics_top_visitors() {
$sql = "SELECT COUNT(a.uid) AS hits, a.uid, u.name, a.hostname, SUM(a.timer) AS total, ac.aid FROM {accesslog} a LEFT JOIN {access} ac ON ac.type = 'host' AND LOWER(a.hostname) LIKE (ac.mask) LEFT JOIN {users} u ON a.uid = u.uid GROUP BY a.hostname, a.uid, u.name, ac.aid". tablesort_sql($header);
$sql_cnt = "SELECT COUNT(DISTINCT(uid)) FROM {accesslog}";
- $result = pager_query($sql, 30, 0, $sql_cnt);
+ $result = pager_query($sql, variable_get('admin_pager_normal', 30), 0, $sql_cnt);
while ($account = db_fetch_object($result)) {
$qs = drupal_get_destination();
@@ -303,7 +303,7 @@ function statistics_top_visitors() {
drupal_set_title(t('Top visitors in the past %interval', array('%interval' => format_interval(variable_get('statistics_flush_accesslog_timer', 259200)))));
$output = theme('table', $header, $rows);
- $output .= theme('pager', NULL, 30, 0);
+ $output .= theme('pager', NULL, variable_get('admin_pager_normal', 30), 0);
return $output;
}
@@ -322,14 +322,14 @@ function statistics_top_referrers() {
);
$query .= tablesort_sql($header);
- $result = pager_query($query, 30, 0, $query_cnt, $_SERVER['HTTP_HOST']);
+ $result = pager_query($query, variable_get('admin_pager_normal', 30), 0, $query_cnt, $_SERVER['HTTP_HOST']);
while ($referrer = db_fetch_object($result)) {
$rows[] = array($referrer->hits, _statistics_link($referrer->url), t('%time ago', array('%time' => format_interval(time() - $referrer->last))));
}
$output = theme('table', $header, $rows);
- $output .= theme('pager', NULL, 30, 0);
+ $output .= theme('pager', NULL, variable_get('admin_pager_normal', 30), 0);
return $output;
}
Index: modules/taxonomy.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy.module,v
retrieving revision 1.286
diff -u -p -r1.286 taxonomy.module
--- modules/taxonomy.module 24 May 2006 04:54:52 -0000 1.286
+++ modules/taxonomy.module 24 May 2006 16:08:31 -0000
@@ -160,7 +160,7 @@ function taxonomy_overview_terms($vid) {
drupal_set_title(check_plain($vocabulary->name));
$start_from = $_GET['page'] ? $_GET['page'] : 0;
$total_entries = 0; // total count for pager
- $page_increment = 25; // number of tids per page
+ $page_increment = variable_get('admin_pager_normal', 30); // number of tids per page
$displayed_count = 0; // number of tids shown
$tree = taxonomy_get_tree($vocabulary->vid);
Index: modules/tracker.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/tracker.module,v
retrieving revision 1.130
diff -u -p -r1.130 tracker.module
--- modules/tracker.module 7 May 2006 00:08:36 -0000 1.130
+++ modules/tracker.module 24 May 2006 16:08:31 -0000
@@ -87,14 +87,14 @@ function tracker_page($uid = 0) {
$sql = db_rewrite_sql($sql);
$sql_count = 'SELECT COUNT(DISTINCT(n.nid)) FROM {node} n LEFT JOIN {comments} c ON n.nid = c.nid AND (c.status = %d OR c.status IS NULL) WHERE n.status = 1 AND (n.uid = %d OR c.uid = %d)';
$sql_count = db_rewrite_sql($sql_count);
- $result = pager_query($sql, 25, 0, $sql_count, COMMENT_PUBLISHED, $uid, $uid);
+ $result = pager_query($sql, variable_get('admin_pager_normal', 30), 0, $sql_count, COMMENT_PUBLISHED, $uid, $uid);
}
else {
$sql = 'SELECT DISTINCT(n.nid), n.title, n.type, n.changed, n.uid, u.name, l.last_comment_timestamp AS last_post, l.comment_count FROM {node} n INNER JOIN {users} u ON n.uid = u.uid INNER JOIN {node_comment_statistics} l ON n.nid = l.nid WHERE n.status = 1 ORDER BY last_post DESC';
$sql = db_rewrite_sql($sql);
$sql_count = 'SELECT COUNT(n.nid) FROM {node} n WHERE n.status = 1';
$sql_count = db_rewrite_sql($sql_count);
- $result = pager_query($sql, 25, 0, $sql_count);
+ $result = pager_query($sql, variable_get('admin_pager_normal', 30), 0, $sql_count);
}
while ($node = db_fetch_object($result)) {
Index: modules/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user.module,v
retrieving revision 1.625
diff -u -p -r1.625 user.module
--- modules/user.module 24 May 2006 05:51:10 -0000 1.625
+++ modules/user.module 24 May 2006 16:08:32 -0000
@@ -1920,7 +1920,7 @@ function user_admin_account() {
);
$sql = 'SELECT u.uid, u.name, u.status, u.created, u.access FROM {users} u WHERE uid != 0';
$sql .= tablesort_sql($header);
- $result = pager_query($sql, 50);
+ $result = pager_query($sql, variable_get('admin_pager_long', 50));
$status = array(t('blocked'), t('active'));
while ($account = db_fetch_object($result)) {
@@ -1932,7 +1932,7 @@ function user_admin_account() {
}
$output = theme('table', $header, $rows);
- $output .= theme('pager', NULL, 50, 0);
+ $output .= theme('pager', NULL, variable_get('admin_pager_long', 50), 0);
return $output;
}
Index: modules/watchdog.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/watchdog.module,v
retrieving revision 1.144
diff -u -p -r1.144 watchdog.module
--- modules/watchdog.module 7 May 2006 00:08:36 -0000 1.144
+++ modules/watchdog.module 24 May 2006 16:08:32 -0000
@@ -112,10 +112,10 @@ function watchdog_overview() {
$tablesort = tablesort_sql($header);
$type = $_SESSION['watchdog_overview_filter'];
if ($type != 'all') {
- $result = pager_query($sql ." WHERE w.type = '%s'". $tablesort, 50, 0, NULL, $type);
+ $result = pager_query($sql ." WHERE w.type = '%s'". $tablesort, variable_get('admin_pager_long', 50), 0, NULL, $type);
}
else {
- $result = pager_query($sql . $tablesort, 50);
+ $result = pager_query($sql . $tablesort, variable_get('admin_pager_long', 50));
}
while ($watchdog = db_fetch_object($result)) {