From ab64b55d4b785d758d13b781ac4769707666f355 Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Fri, 27 Feb 2004 02:34:54 +0000
Subject: [PATCH] merging 5.5.5 changes

---
 lib/WebGUI/DateTime.pm     | 5 +++--
 lib/WebGUI/ErrorHandler.pm | 5 ++++-
 lib/WebGUI/Paginator.pm    | 8 ++++----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/lib/WebGUI/DateTime.pm b/lib/WebGUI/DateTime.pm
index 95dc8acff..6e14d1ca9 100644
--- a/lib/WebGUI/DateTime.pm
+++ b/lib/WebGUI/DateTime.pm
@@ -622,7 +622,7 @@ sub intervalToSeconds {
 
 =head2 localtime ( epoch )
 
-Returns an array of time elements. The elements are: years, months, days, hours, minutes, seconds, day of year, day of week.
+Returns an array of time elements. The elements are: years, months, days, hours, minutes, seconds, day of year, day of week, daylight savings.
 
 =over
 
@@ -642,7 +642,8 @@ sub localtime {
 	}
 	my $doy = Date::Calc::Day_of_Year($year,$month,$day);
 	my $dow = Date::Calc::Day_of_Week($year,$month,$day);
-	return ($year, $month, $day, $hour, $min, $sec, $doy, $dow);
+	my @temp = Date::Calc::System_Clock();
+	return ($year, $month, $day, $hour, $min, $sec, $doy, $dow, $temp[8]);
 }
 
 #-------------------------------------------------------------------
diff --git a/lib/WebGUI/ErrorHandler.pm b/lib/WebGUI/ErrorHandler.pm
index af31af820..8524578f1 100644
--- a/lib/WebGUI/ErrorHandler.pm
+++ b/lib/WebGUI/ErrorHandler.pm
@@ -106,7 +106,10 @@ sub fatalError {
 	$toLog .= getSessionVars();
         writeLog($toLog);
         unless ($WebGUI::Session::session{setting}{showDebug}) {
-                print WebGUI::International::get(416).'<br>';
+		#NOTE: You can't internationalize this because with some types of errors that would cause an infinite loop.                
+		print "<h1>Problem With Request</h1>                        
+			We have encountered a problem with your request. Please use your back button and try again.                         
+			If this problem persists, please contact us with what you were trying to do and the time and date of the problem.";
                 print '<br>'.$WebGUI::Session::session{setting}{companyName};
                 print '<br>'.$WebGUI::Session::session{setting}{companyEmail};
                 print '<br>'.$WebGUI::Session::session{setting}{companyURL};
diff --git a/lib/WebGUI/Paginator.pm b/lib/WebGUI/Paginator.pm
index 1d07190d1..2c3f84ff2 100644
--- a/lib/WebGUI/Paginator.pm
+++ b/lib/WebGUI/Paginator.pm
@@ -77,10 +77,10 @@ The hash reference to append the variables to.
 sub appendTemplateVars {
 	my $self = shift;
 	my $var = shift;
-	$var->{'pagination.firstpage'} = $self->getFirstPageLink;
-	$var->{'pagination.lastpage'} = $self->getLastPageLink;
-	$var->{'pagination.nextpage'} = $self->getNextPageLink;
-	$var->{'pagination.previouspage'} = $self->getPreviousPageLink;
+	$var->{'pagination.firstPage'} = $self->getFirstPageLink;
+	$var->{'pagination.lastPage'} = $self->getLastPageLink;
+	$var->{'pagination.nextPage'} = $self->getNextPageLink;
+	$var->{'pagination.previousPage'} = $self->getPreviousPageLink;
 	$var->{'pagination.pageNumber'} = $self->getPageNumber;
 	$var->{'pagination.pageCount'} = $self->getNumberOfPages;
 	$var->{'pagination.pageCount.isMultiple'} = ($self->getNumberOfPages > 1);