X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=lib%2FMaypole.pm;h=6e41ee7d3e56f88428bfdd022ce1c04f719762f2;hb=7637da3c79552ce54e8b71b880af799ddfd64eca;hp=e4c0f7318e8847c1d38504ec2df014dda1a38f5e;hpb=7dda5e1451220612c6ad749746d84e4c090e330c;p=maypole.git

diff --git a/lib/Maypole.pm b/lib/Maypole.pm
index e4c0f73..6e41ee7 100644
--- a/lib/Maypole.pm
+++ b/lib/Maypole.pm
@@ -1,13 +1,12 @@
 package Maypole;
 use base qw(Class::Accessor::Fast Class::Data::Inheritable);
-use attributes ();
 use UNIVERSAL::require;
 use strict;
 use warnings;
 use Maypole::Config;
 use Maypole::Constants;
 
-our $VERSION = '2.0';
+our $VERSION = '2.04';
 
 __PACKAGE__->mk_classdata($_) for qw( config init_done view_object );
 __PACKAGE__->mk_accessors(
@@ -49,7 +48,7 @@ sub init {
     $config->view->require;
     die "Couldn't load the view class " . $config->view . ": $@" if $@;
     $config->display_tables
-      || $config->display_tables( [ $class->config->tables ] );
+      || $config->display_tables( $class->config->tables );
     $class->view_object( $class->config->view->new );
     $class->init_done(1);
 
@@ -60,7 +59,7 @@ sub handler {
     # See Maypole::Workflow before trying to understand this.
     my ( $class, $req ) = @_;
     $class->init unless $class->init_done;
-    my $r = bless { config => $class->config }, $class;
+    my $r = bless { template_args => {}, config => $class->config }, $class;
     $r->get_request($req);
     $r->parse_location();
     my $status = $r->handler_guts();
@@ -134,7 +133,8 @@ sub is_applicable {
       . "Available tables are: "
       . join( ",", @{ $config->{display_tables} } )
       if $self->debug
-      and not $config->ok_tables->{ $self->{table} };
+      and not $config->ok_tables->{ $self->{table} }
+      and $self->{action};
     return DECLINED() unless exists $config->ok_tables->{ $self->{table} };
 
     # Is it public?
@@ -441,8 +441,8 @@ Simon Cozens, C<simon@cpan.org>
 =head1 THANKS TO
 
 Danijel Milicevic, Dave Slack, Jesse Sheidlower, Jody Belka, Marcus Ramberg,
-Mickael Joanne, Simon Flack, Veljko Vidovic and all the others who've
-helped.
+Mickael Joanne, Randal Schwartz, Simon Flack, Steve Simms, Veljko Vidovic
+and all the others who've helped.
 
 =head1 LICENSE