From d917c60085d7d79df826554bf8eb8c77c540aa4e Mon Sep 17 00:00:00 2001
From: Matthew Wilson <matt@plainblack.com>
Date: Mon, 8 May 2006 02:10:20 +0000
Subject: [PATCH] cleanup and handling edge cases

---
 lib/WebGUI/Paginator.pm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/WebGUI/Paginator.pm b/lib/WebGUI/Paginator.pm
index e96a0956d..cd212adc3 100644
--- a/lib/WebGUI/Paginator.pm
+++ b/lib/WebGUI/Paginator.pm
@@ -383,10 +383,13 @@ sub getPageLinks {
 	for (my $i=0; $i<$self->getNumberOfPages; $i++) {
 		my $altTag;
 		if ($self->{abKey}) {
+			my $first = $i * $self->{_rpp};
+			my $last = (($i+1) * $self->{_rpp})-1;
+			$last = $self->{_totalRows} - 1 if $last >= $self->{_totalRows};
 			if ($self->{abInitialOnly}) {
-				$altTag = ' title="'.substr($self->{_rowRef}[($i * $self->{_rpp})+1]->{$self->{abKey}},0,1).'-'.substr($self->{_rowRef}[(($i+1) * $self->{_rpp})-1]->{$self->{abKey}},0,1).'"';
+				$altTag = ' title="'.substr($self->{_rowRef}[$first]->{$self->{abKey}},0,1).'-'.substr($self->{_rowRef}[$last]->{$self->{abKey}},0,1).'"';
 			} else {
-				$altTag = ' title="'.$self->{_rowRef}[($i * $self->{_rpp})+1]->{$self->{abKey}}.' - '.$self->{_rowRef}[(($i+1) * $self->{_rpp})-1]->{$self->{abKey}}.'"';
+				$altTag = ' title="'.$self->{_rowRef}[$first]->{$self->{abKey}}.' - '.$self->{_rowRef}[$last]->{$self->{abKey}}.'"';
 			}
 		}
 		if ($i+1 == $pn) {