X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=lib%2FMaypole.pm;h=e16dd829abc76ab7e3c6d1da9b40f0153cfc7e85;hb=9b8f3c269605db27908000957b20cc3a336f9148;hp=f7699c3c259adc050d701d1a20d7a30be154aa46;hpb=06e77b2be76e0c2ae19ad3b4d0afac7fea4f2581;p=maypole.git diff --git a/lib/Maypole.pm b/lib/Maypole.pm index f7699c3..e16dd82 100644 --- a/lib/Maypole.pm +++ b/lib/Maypole.pm @@ -6,7 +6,7 @@ use warnings; use Maypole::Config; use Maypole::Constants; -our $VERSION = '2.0'; +our $VERSION = '2.05'; __PACKAGE__->mk_classdata($_) for qw( config init_done view_object ); __PACKAGE__->mk_accessors( @@ -23,6 +23,7 @@ sub setup { $calling_class = ref $calling_class if ref $calling_class; { no strict 'refs'; + no warnings 'redefine'; # Naughty. *{ $calling_class . "::handler" } = @@ -48,7 +49,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); @@ -59,10 +60,9 @@ 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(); - warn "Request path: $r->{path}" if $r->debug; my $status = $r->handler_guts(); return $status unless $status == OK; $r->send_output; @@ -73,6 +73,7 @@ sub handler { sub handler_guts { my $r = shift; $r->model_class( $r->config->model->class_of( $r, $r->{table} ) ); + my $applicable = $r->is_applicable; unless ( $applicable == OK ) { @@ -442,8 +443,8 @@ Simon Cozens, C =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