From 84e20a1a964fd3ebdced68b229666ef5163b7aad Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Sat, 14 Jan 2006 18:58:30 +0000
Subject: [PATCH] Session/Http, rework getCookies logic so that empty hash is
 returned if there's no request object.  That way a sessionId gets created
 back in Session::Var::start.

Session.pm: pass Session::DateTime->new a session object instead of self

Session/DateTime.pm:  Added a space.  Note that this is infinite recursion since
it calls itself.
---
 lib/WebGUI/Session.pm          | 2 +-
 lib/WebGUI/Session/DateTime.pm | 2 +-
 lib/WebGUI/Session/Http.pm     | 7 ++++++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/WebGUI/Session.pm b/lib/WebGUI/Session.pm
index b304ad731..b0a4bb0b1 100644
--- a/lib/WebGUI/Session.pm
+++ b/lib/WebGUI/Session.pm
@@ -148,7 +148,7 @@ Returns a WebGUI::Session::DateTime object.
 sub datetime {
 	my $self = shift;
 	if (exists $self->{_datetime}) {
-		$self->{_datetime} = WebGUI::Session::DateTime->new($self);
+		$self->{_datetime} = WebGUI::Session::DateTime->new($self->session);
 	}
 	return $self->{_datetime};
 }
diff --git a/lib/WebGUI/Session/DateTime.pm b/lib/WebGUI/Session/DateTime.pm
index 708d8688e..505c21615 100644
--- a/lib/WebGUI/Session/DateTime.pm
+++ b/lib/WebGUI/Session/DateTime.pm
@@ -727,7 +727,7 @@ Returns an epoch date for now.
 
 sub time {
 	my $self = shift;
-	return$self->session->datetime->time();
+	return $self->session->datetime->time();
 }
 
 #-------------------------------------------------------------------
diff --git a/lib/WebGUI/Session/Http.pm b/lib/WebGUI/Session/Http.pm
index fb4a1643c..336a180df 100644
--- a/lib/WebGUI/Session/Http.pm
+++ b/lib/WebGUI/Session/Http.pm
@@ -63,7 +63,12 @@ Retrieves the cookies from the HTTP header and returns a hash reference containi
 
 sub getCookies {
 	my $self = shift;
-	return APR::Request::Apache2->handle($self->session->request)->jar();
+	if ($self->session->request) {
+		return APR::Request::Apache2->handle($self->session->request)->jar();
+	}
+	else {
+		return {};
+	}
 }