Index: includes/locale.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/locale.inc,v
retrieving revision 1.54
diff -u -r1.54 locale.inc
--- includes/locale.inc	11 Oct 2005 19:44:34 -0000	1.54
+++ includes/locale.inc	12 Oct 2005 23:33:01 -0000
@@ -1078,7 +1078,7 @@
         $sql = "$join $where AND t.locale = '". db_escape_string($query->language) ."' $orderby";
     }
 
-    $result = pager_query($sql, 50);
+    $result = pager_query($sql, variable_get('admin_pager_long', 50));
 
     $header = array(t('String'), t('Locales'), array('data' => t('Operations'), 'colspan' => '2'));
     $arr = array();
@@ -1101,7 +1101,7 @@
     if (count($rows)) {
       $output .= theme('table', $header, $rows);
     }
-    if ($pager = theme('pager', NULL, 50, 0, $request)) {
+    if ($pager = theme('pager', NULL, variable_get('admin_pager_long', 50), 0, $request)) {
       $output .= $pager;
     }
   }
Index: modules/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment.module,v
retrieving revision 1.381
diff -u -r1.381 comment.module
--- modules/comment.module	11 Oct 2005 19:44:34 -0000	1.381
+++ modules/comment.module	12 Oct 2005 23:19:34 -0000
@@ -958,7 +958,7 @@
   $status = ($type == 'approval') ? COMMENT_NOT_PUBLISHED : COMMENT_PUBLISHED;
   $sql = 'SELECT c.subject, c.nid, c.cid, c.comment, c.timestamp, c.status, c.name, c.homepage, u.name AS registered_name, u.uid FROM {comments} c INNER JOIN {users} u ON u.uid = c.uid WHERE c.status = '. db_escape_string($status);
   $sql .= tablesort_sql($header);
-  $result = pager_query($sql, 50);
+  $result = pager_query($sql, variable_get('admin_pager_long', 50));
 
   while ($comment = db_fetch_object($result)) {
     $comment->name = $comment->uid ? $comment->registered_name : $comment->name;
@@ -977,7 +977,7 @@
   }
 
   $output = theme('table', $header, $rows);
-  $output .= theme('pager', NULL, 50, 0, tablesort_pager());
+  $output .= theme('pager', NULL, variable_get('admin_pager_long', 50), 0, tablesort_pager());
   return $output;
 }
 
Index: modules/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node.module,v
retrieving revision 1.535
diff -u -r1.535 node.module
--- modules/node.module	11 Oct 2005 19:44:34 -0000	1.535
+++ modules/node.module	12 Oct 2005 23:22:09 -0000
@@ -965,7 +965,7 @@
 
   $filter = node_build_filter_query();
 
-  $result = pager_query('SELECT n.*, u.name, u.uid FROM {node} n '. $filter['join'] .' INNER JOIN {users} u ON n.uid = u.uid '. $filter['where'] .' ORDER BY n.changed DESC', 50, 0, NULL, $filter['args']);
+  $result = pager_query('SELECT n.*, u.name, u.uid FROM {node} n '. $filter['join'] .' INNER JOIN {users} u ON n.uid = u.uid '. $filter['where'] .' ORDER BY n.changed DESC', variable_get('admin_pager_long', 50), 0, NULL, $filter['args']);
 
   $form['options'] = array(
     '#type' => 'fieldset', '#title' => t('Update options'),
@@ -988,7 +988,7 @@
     $form['operations'][$node->nid] = array('#value' => l(t('edit'), 'node/'. $node->nid .'/edit', array(), $destination));
   }
   $form['nodes'] = array('#type' => 'checkboxes', '#options' => $nodes);
-  $form['pager'] = array('value' => theme('pager', NULL, 50, 0));
+  $form['pager'] = array('value' => theme('pager', NULL, variable_get('admin_pager_long', 50), 0));
 
   $form['#method'] = 'post';
   $form['#action'] =  url('admin/node/action');
Index: modules/path.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/path.module,v
retrieving revision 1.67
diff -u -r1.67 path.module
--- modules/path.module	11 Oct 2005 19:44:35 -0000	1.67
+++ modules/path.module	12 Oct 2005 23:22:56 -0000
@@ -246,7 +246,7 @@
     array('data' => t('Operations'), 'colspan' => '2')
   );
   $sql .= tablesort_sql($header);
-  $result = pager_query($sql, 50);
+  $result = pager_query($sql, variable_get('admin_pager_long', 50));
 
   $destination = drupal_get_destination();
   while ($data = db_fetch_object($result)) {
@@ -258,7 +258,7 @@
   }
 
   $output = theme('table', $header, $rows);
-  $output .= theme('pager', NULL, 50, 0, tablesort_pager());
+  $output .= theme('pager', NULL, variable_get('admin_pager_long', 50), 0, tablesort_pager());
   return $output;
 }
 
Index: modules/profile.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/profile.module,v
retrieving revision 1.113
diff -u -r1.113 profile.module
--- modules/profile.module	11 Oct 2005 19:44:35 -0000	1.113
+++ modules/profile.module	12 Oct 2005 23:24:56 -0000
@@ -160,7 +160,7 @@
     }
 
     // Extract the affected users:
-    $result = pager_query("SELECT u.uid FROM {users} u INNER JOIN {profile_values} v ON u.uid = v.uid WHERE v.fid = %d AND $query ORDER BY u.access DESC", 20, 0, NULL, $field->fid);
+    $result = pager_query("SELECT u.uid FROM {users} u INNER JOIN {profile_values} v ON u.uid = v.uid WHERE v.fid = %d AND $query ORDER BY u.access DESC", variable_get('admin_pager_normal', 30), 0, NULL, $field->fid);
 
     $output = '<div id="profile">';
     while ($account = db_fetch_object($result)) {
@@ -168,7 +168,7 @@
       _profile_update_user_fields($fields, $account);
       $output .= theme('profile_listing', $account, $fields);
     }
-    $output .= theme('pager', NULL, 20);
+    $output .= theme('pager', NULL, variable_get('admin_pager_normal', 30));
 
     if ($field->type == 'selection' || $field->type == 'list') {
       $title = strtr($field->page, array('%value' => theme('placeholder', $value)));
@@ -193,7 +193,7 @@
     }
 
     // Extract the affected users:
-    $result = pager_query("SELECT uid FROM {users} WHERE uid > 0 ORDER BY access DESC", 20, 0, NULL);
+    $result = pager_query("SELECT uid FROM {users} WHERE uid > 0 ORDER BY access DESC", variable_get('admin_pager_normal', 30), 0, NULL);
 
     $output = '<div id="profile">';
     while ($account = db_fetch_object($result)) {
@@ -202,7 +202,7 @@
       $output .= theme('profile_listing', $account, $fields);
     }
     $output .= '</div>';
-    $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.210
diff -u -r1.210 statistics.module
--- modules/statistics.module	12 Oct 2005 01:00:24 -0000	1.210
+++ modules/statistics.module	12 Oct 2005 23:28:50 -0000
@@ -168,7 +168,7 @@
         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'),
@@ -179,7 +179,7 @@
 
     drupal_set_title(check_plain($node->title));
     $output = theme('table', $header, $rows);
-    $output .= theme('pager', NULL, 30, 0, tablesort_pager());
+    $output .= theme('pager', NULL, variable_get('admin_pager_normal', 30), 0, tablesort_pager());
     return $output;
   }
   else {
@@ -195,7 +195,7 @@
         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'),
@@ -205,7 +205,7 @@
 
     drupal_set_title($account->name);
     $output = theme('table', $header, $rows);
-    $output .= theme('pager', NULL, 30, 0, tablesort_pager());
+    $output .= theme('pager', NULL, variable_get('admin_pager_normal', 30), 0, tablesort_pager());
     return $output;
   }
   else {
@@ -226,7 +226,7 @@
 
   $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'),
@@ -236,7 +236,7 @@
   }
 
   $output = theme('table', $header, $rows);
-  $output .= theme('pager', NULL, 30, 0, tablesort_pager());
+  $output .= theme('pager', NULL, variable_get('admin_pager_normal', 30), 0, tablesort_pager());
   return $output;
 }
 
@@ -254,7 +254,7 @@
     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)));
@@ -262,7 +262,7 @@
 
   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, tablesort_pager());
+  $output .= theme('pager', NULL, variable_get('admin_pager_normal', 30), 0, tablesort_pager());
   return $output;
 }
 
@@ -280,7 +280,7 @@
 
   $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". 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();
@@ -290,7 +290,7 @@
 
   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, tablesort_pager());
+  $output .= theme('pager', NULL, variable_get('admin_pager_normal', 30), 0, tablesort_pager());
   return $output;
 }
 
@@ -309,14 +309,14 @@
   );
 
   $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, '<a href="'. check_url($referrer->url) .'">'. check_plain(_statistics_column_width($referrer->url)) .'</a>', t('%time ago', array('%time' => format_interval(time() - $referrer->last))));
   }
 
   $output = theme('table', $header, $rows);
-  $output .= theme('pager', NULL, 30, 0, tablesort_pager());
+  $output .= theme('pager', NULL, variable_get('admin_pager_normal', 30), 0, tablesort_pager());
   return $output;
 }
 
Index: modules/taxonomy.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy.module,v
retrieving revision 1.229
diff -u -r1.229 taxonomy.module
--- modules/taxonomy.module	11 Oct 2005 19:44:35 -0000	1.229
+++ modules/taxonomy.module	12 Oct 2005 23:30:31 -0000
@@ -398,7 +398,7 @@
     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/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user.module,v
retrieving revision 1.518
diff -u -r1.518 user.module
--- modules/user.module	11 Oct 2005 20:52:16 -0000	1.518
+++ modules/user.module	12 Oct 2005 23:31:26 -0000
@@ -1738,7 +1738,7 @@
   );
   $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'));
   $destination = drupal_get_destination();
@@ -1751,7 +1751,7 @@
   }
 
   $output = theme('table', $header, $rows);
-  $output .= theme('pager', NULL, 50, 0, tablesort_pager());
+  $output .= theme('pager', NULL, variable_get('admin_pager_long', 50), 0, tablesort_pager());
   return $output;
 }
 
Index: modules/watchdog.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/watchdog.module,v
retrieving revision 1.130
diff -u -r1.130 watchdog.module
--- modules/watchdog.module	11 Oct 2005 19:44:35 -0000	1.130
+++ modules/watchdog.module	12 Oct 2005 23:31:52 -0000
@@ -100,7 +100,7 @@
     array('data' => t('Operations'), 'colspan' => '2')
   );
   $sql = 'SELECT w.*, u.name, u.uid FROM {watchdog} w INNER JOIN {users} u ON w.uid = u.uid '. $queries[$_SESSION['watchdog_overview_filter']] . tablesort_sql($header);
-  $result = pager_query($sql, 50);
+  $result = pager_query($sql, variable_get('admin_pager_long', 50));
 
   while ($watchdog = db_fetch_object($result)) {
     $rows[] = array('data' =>
@@ -125,7 +125,7 @@
 
 
   $output .= theme('table', $header, $rows);
-  $output .= theme('pager', NULL, 50, 0, tablesort_pager());
+  $output .= theme('pager', NULL, variable_get('admin_pager_long', 50), 0, tablesort_pager());
 
   return $output;
 }