Index: includes/pager.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/pager.inc,v
retrieving revision 1.63
diff -u -F^function -r1.63 pager.inc
--- includes/pager.inc	6 Dec 2007 09:58:30 -0000	1.63
+++ includes/pager.inc	17 May 2008 23:17:35 -0000
@@ -49,7 +49,7 @@
  * @ingroup database
  */
 function pager_query($query, $limit = 10, $element = 0, $count_query = NULL) {
-  global $pager_page_array, $pager_total, $pager_total_items;
+  global $pager_current_page, $pager_page_count, $pager_item_count;
   $page = isset($_GET['page']) ? $_GET['page'] : '';
 
   // Substitute in query arguments.
@@ -66,13 +66,13 @@ function pager_query($query, $limit = 10
   }
 
   // Convert comma-separated $page to an array, used by other functions.
-  $pager_page_array = explode(',', $page);
+  $pager_current_page = explode(',', $page);
 
   // We calculate the total of pages as ceil(items / limit).
-  $pager_total_items[$element] = db_result(db_query($count_query, $args));
-  $pager_total[$element] = ceil($pager_total_items[$element] / $limit);
-  $pager_page_array[$element] = max(0, min((int)$pager_page_array[$element], ((int)$pager_total[$element]) - 1));
-  return db_query_range($query, $args, $pager_page_array[$element] * $limit, $limit);
+  $pager_item_count[$element] = db_result(db_query($count_query, $args));
+  $pager_page_count[$element] = ceil($pager_item_count[$element] / $limit);
+  $pager_current_page[$element] = max(0, min((int)$pager_current_page[$element], ((int)$pager_page_count[$element]) - 1));
+  return db_query_range($query, $args, $pager_current_page[$element] * $limit, $limit);
 }
 
 /**
@@ -113,19 +113,19 @@ function pager_get_querystring() {
  * @ingroup themeable
  */
 function theme_pager($tags = array(), $limit = 10, $element = 0, $parameters = array(), $quantity = 9) {
-  global $pager_page_array, $pager_total;
+  global $pager_current_page, $pager_page_count;
 
   // Calculate various markers within this pager piece:
   // Middle is used to "center" pages around the current page.
   $pager_middle = ceil($quantity / 2);
   // current is the page we are currently paged to
-  $pager_current = $pager_page_array[$element] + 1;
+  $pager_current = $pager_current_page[$element] + 1;
   // first is the first page listed by this pager piece (re quantity)
   $pager_first = $pager_current - $pager_middle + 1;
   // last is the last page listed by this pager piece (re quantity)
   $pager_last = $pager_current + $quantity - $pager_middle;
   // max is the maximum page number
-  $pager_max = $pager_total[$element];
+  $pager_max = $pager_page_count[$element];
   // End of marker calculations.
 
   // Prepare for generation loop.
@@ -147,7 +147,7 @@ function theme_pager($tags = array(), $l
   $li_next = theme('pager_next', (isset($tags[3]) ? $tags[3] : t('next ›')), $limit, $element, 1, $parameters);
   $li_last = theme('pager_last', (isset($tags[4]) ? $tags[4] : t('last »')), $limit, $element, $parameters);
 
-  if ($pager_total[$element] > 1) {
+  if ($pager_page_count[$element] > 1) {
     if ($li_first) {
       $items[] = array(
         'class' => 'pager-first',
@@ -239,12 +239,12 @@ function theme_pager($tags = array(), $l
  * @ingroup themeable
  */
 function theme_pager_first($text, $limit, $element = 0, $parameters = array()) {
-  global $pager_page_array;
+  global $pager_current_page;
   $output = '';
 
   // If we are anywhere but the first page
-  if ($pager_page_array[$element] > 0) {
-    $output = theme('pager_link', $text, pager_load_array(0, $element, $pager_page_array), $element, $parameters);
+  if ($pager_current_page[$element] > 0) {
+    $output = theme('pager_link', $text, pager_load_array(0, $element, $pager_current_page), $element, $parameters);
   }
 
   return $output;
@@ -269,12 +269,12 @@ function theme_pager_first($text, $limit
  * @ingroup themeable
  */
 function theme_pager_previous($text, $limit, $element = 0, $interval = 1, $parameters = array()) {
-  global $pager_page_array;
+  global $pager_current_page;
   $output = '';
 
   // If we are anywhere but the first page
-  if ($pager_page_array[$element] > 0) {
-    $page_new = pager_load_array($pager_page_array[$element] - $interval, $element, $pager_page_array);
+  if ($pager_current_page[$element] > 0) {
+    $page_new = pager_load_array($pager_current_page[$element] - $interval, $element, $pager_current_page);
 
     // If the previous page is the first page, mark the link as such.
     if ($page_new[$element] == 0) {
@@ -308,14 +308,14 @@ function theme_pager_previous($text, $li
  * @ingroup themeable
  */
 function theme_pager_next($text, $limit, $element = 0, $interval = 1, $parameters = array()) {
-  global $pager_page_array, $pager_total;
+  global $pager_current_page, $pager_page_count;
   $output = '';
 
   // If we are anywhere but the last page
-  if ($pager_page_array[$element] < ($pager_total[$element] - 1)) {
-    $page_new = pager_load_array($pager_page_array[$element] + $interval, $element, $pager_page_array);
+  if ($pager_current_page[$element] < ($pager_page_count[$element] - 1)) {
+    $page_new = pager_load_array($pager_current_page[$element] + $interval, $element, $pager_current_page);
     // If the next page is the last page, mark the link as such.
-    if ($page_new[$element] == ($pager_total[$element] - 1)) {
+    if ($page_new[$element] == ($pager_page_count[$element] - 1)) {
       $output = theme('pager_last', $text, $limit, $element, $parameters);
     }
     // The next page is not the last page.
@@ -344,12 +344,12 @@ function theme_pager_next($text, $limit,
  * @ingroup themeable
  */
 function theme_pager_last($text, $limit, $element = 0, $parameters = array()) {
-  global $pager_page_array, $pager_total;
+  global $pager_current_page, $pager_page_count;
   $output = '';
 
   // If we are anywhere but the last page
-  if ($pager_page_array[$element] < ($pager_total[$element] - 1)) {
-    $output = theme('pager_link', $text, pager_load_array($pager_total[$element] - 1, $element, $pager_page_array), $element, $parameters);
+  if ($pager_current_page[$element] < ($pager_page_count[$element] - 1)) {
+    $output = theme('pager_link', $text, pager_load_array($pager_page_count[$element] - 1, $element, $pager_current_page), $element, $parameters);
   }
 
   return $output;
Index: modules/taxonomy/taxonomy.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.admin.inc,v
retrieving revision 1.25
diff -u -F^function -r1.25 taxonomy.admin.inc
--- modules/taxonomy/taxonomy.admin.inc	14 Apr 2008 17:48:42 -0000	1.25
+++ modules/taxonomy/taxonomy.admin.inc	17 May 2008 23:17:54 -0000
@@ -251,7 +251,7 @@ function taxonomy_admin_term_edit($tid) 
  * @see theme_taxonomy_overview_terms()
  */
 function taxonomy_overview_terms(&$form_state, $vocabulary) {
-  global $pager_page_array, $pager_total, $pager_total_items;
+  global $pager_current_page, $pager_page_count, $pager_item_count;
 
   // Check for confirmation forms.
   if (isset($form_state['confirm_reset_alphabetical'])) {
@@ -357,9 +357,9 @@ function taxonomy_overview_terms(&$form_
 
     // Because we didn't use a pager query, set the necessary pager variables.
     $total_entries = $before_entries + $page_entries + $after_entries;
-    $pager_total_items[0] = $total_entries;
-    $pager_page_array[0] = $page;
-    $pager_total[0] = ceil($total_entries / $page_increment);
+    $pager_item_count[0] = $total_entries;
+    $pager_current_page[0] = $page;
+    $pager_page_count[0] = ceil($total_entries / $page_increment);
   }
 
   // If this form was already submitted once, it's probably hit a validation