From d667f724f4d78f36500d940f9ad55eea73746766 Mon Sep 17 00:00:00 2001
From: Graham Knop <graham@plainblack.com>
Date: Sun, 18 Apr 2010 13:42:40 -0500
Subject: [PATCH] fix things i broke

---
 lib/WebGUI/FormValidator.pm        | 3 +++
 lib/WebGUI/Session/DateTime.pm     | 2 +-
 lib/WebGUI/Session/ErrorHandler.pm | 3 ++-
 lib/WebGUI/Session/Http.pm         | 1 +
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/WebGUI/FormValidator.pm b/lib/WebGUI/FormValidator.pm
index bb1cada6b..9df082177 100644
--- a/lib/WebGUI/FormValidator.pm
+++ b/lib/WebGUI/FormValidator.pm
@@ -80,6 +80,9 @@ sub AUTOLOAD {
 	return $control->getValue(@args);
 }
 
+# so it doesn't get autoloaded
+sub DESTROY {}
+
 #-------------------------------------------------------------------
 
 =head2 get ( )
diff --git a/lib/WebGUI/Session/DateTime.pm b/lib/WebGUI/Session/DateTime.pm
index cac8c12ff..bd7f0067b 100644
--- a/lib/WebGUI/Session/DateTime.pm
+++ b/lib/WebGUI/Session/DateTime.pm
@@ -21,7 +21,7 @@ use DateTime::Format::Mail;
 use DateTime::TimeZone;
 use Tie::IxHash;
 use WebGUI::International;
-use WebGUI::Utility qw(round);
+use WebGUI::Utility qw(round isIn);
 use Scalar::Util qw(weaken);
 
 
diff --git a/lib/WebGUI/Session/ErrorHandler.pm b/lib/WebGUI/Session/ErrorHandler.pm
index 19c0d5a4a..a124dba13 100644
--- a/lib/WebGUI/Session/ErrorHandler.pm
+++ b/lib/WebGUI/Session/ErrorHandler.pm
@@ -207,7 +207,8 @@ sub new {
         # Thanks to Plack, wG has been decoupled from Log4Perl
         # However when called outside a web context, we currently still fall back to Log4perl
         # (pending a better idea)
-        Log::Log4perl->init_once( $session->config->getWebguiRoot . "/etc/log.conf" );
+        require Log::Log4perl;
+        Log::Log4perl->init_once( WebGUI::Paths->logConfig );
         my $log4perl = Log::Log4perl->get_logger( $session->config->getFilename );
         $logger = sub {
             my $args  = shift;
diff --git a/lib/WebGUI/Session/Http.pm b/lib/WebGUI/Session/Http.pm
index 15c3fa257..8aee3ee82 100644
--- a/lib/WebGUI/Session/Http.pm
+++ b/lib/WebGUI/Session/Http.pm
@@ -17,6 +17,7 @@ package WebGUI::Session::Http;
 
 use strict;
 use Scalar::Util qw(weaken);
+use WebGUI::Utility qw(isIn);
 use HTTP::Date ();
 
 sub _deprecated {