applied nicg fix, to make code match pod, i.e. make the get_user and get_session...

git-svn-id: http://svn.maypole.perl.org/Maypole/trunk@559 48953598-375a-da11-a14b-00016c27c3ee

diff --git a/Changes b/Changes
index cf75554fa7837b45806483618acb3a8ebad498e8..1433119545883c2a36e23fe45a27c19bdbab9827 100644 (file)
--- a/Changes
+++ b/Changes
@@ -25,6 +25,7 @@ For information about current developments and future releases, see:
    added search_columns method to base cdbi model class, provides display_columns unless over-ridden
    fix to display_line macro in factory templates (bug 22920)
    fix to correct problem with LocationMatch and regex based Location directives in apache config.
+   change to view::base to only call display_columns,  stringify_columns, to_cgi if model class can
 
 2.11 Mon 31 July 2006
 

diff --git a/lib/Maypole.pm b/lib/Maypole.pm
index fdb1b8659a493d76daad16232a65cf882ae36065..c6cef443b397ddf128dc25354cd61553dbf599c2 100644 (file)
--- 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;