Merge branch 'psgi' of github.com:plainblack/webgui into psgi

* 'psgi' of github.com:plainblack/webgui:
  fix things i broke

Conflicts:
	lib/WebGUI/Session/ErrorHandler.pm

lib/WebGUI/FormValidator.pm

@@ -80,6 +80,9 @@ sub AUTOLOAD {
 	return $control->getValue(@args);
 }
 
+# so it doesn't get autoloaded
+sub DESTROY {}
+
 #-------------------------------------------------------------------
 
 =head2 get ( )

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);
 
 

lib/WebGUI/Session/ErrorHandler.pm

@@ -207,6 +207,7 @@ 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)
+        require Log::Log4perl;
         Log::Log4perl->init_once( WebGUI::Paths->logConfig );
         my $log4perl = Log::Log4perl->get_logger( $session->config->getFilename );
         $logger = sub {

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 {