X-Git-Url: https://git.decadent.org.uk/gitweb/?p=maypole.git;a=blobdiff_plain;f=lib%2FMaypole.pm;h=c6cef443b397ddf128dc25354cd61553dbf599c2;hp=fdb1b8659a493d76daad16232a65cf882ae36065;hb=ef6d6cc9adeae9b32f41b1bf388fa1be5013a5c9;hpb=15ccc6266852d11e4e4aa10c67b15c70fe9470fb

diff --git a/lib/Maypole.pm b/lib/Maypole.pm
index fdb1b86..c6cef44 100644
--- a/lib/Maypole.pm
+++ b/lib/Maypole.pm
@@ -184,7 +184,8 @@ __PACKAGE__->mk_classdata($_) for qw( config init_done view_object model_classes
 __PACKAGE__->mk_accessors(
     qw( params query objects model_class template_args output path
         args action template error document_encoding content_type table
-        headers_in headers_out stash status parent build_form_elements)
+        headers_in headers_out stash status parent build_form_elements
+        user session)
 );
 
 __PACKAGE__->config( Maypole::Config->new() );
@@ -435,8 +436,10 @@ sub handler : method  {
   return $self->status unless $self->status == Maypole::Constants::OK();
   die "status undefined after start_request_hook()" unless defined
     $self->status;
-  $self->get_session;
-  $self->get_user;
+
+  $self->session($self->get_session);
+  $self->user($self->get_user);
+
   my $status = $self->handler_guts;
   return $status unless $status == OK;
   # TODO: require send_output to return a status code
@@ -474,7 +477,9 @@ sub component {
     $self->args([]);
     $self->objects([]);
 
-    $self->get_user;
+    $self->session($self->get_session);
+    $self->user($self->get_user);
+
     my $url = URI->new($path);
     $self->{path} = $url->path;
     $self->parse_path;