X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst%2FBase.pm;h=a8cc03615c96613ac397c6097ad8674471855295;hp=1b672f0941861f385536bb39f9b2d1c42b749b2c;hb=0ba80bce27a56d366c8d44c254332dd83f9ba0f9;hpb=245ae014f237e59c7b9f0596c6dddf19593512fa diff --git a/lib/Catalyst/Base.pm b/lib/Catalyst/Base.pm index 1b672f0..a8cc036 100644 --- a/lib/Catalyst/Base.pm +++ b/lib/Catalyst/Base.pm @@ -43,7 +43,10 @@ sub _AUTO : Private { sub _ACTION : Private { my ( $self, $c ) = @_; - if ( ref $c->action && $c->action->isa('Catalyst::Action') ) { + if ( ref $c->action + && $c->action->can('execute') + && $c->req->action ) + { $c->action->execute($c); } return !@{ $c->error }; @@ -71,9 +74,7 @@ Catalyst Base Class =head1 METHODS -=over 4 - -=item $self->action_namespace($c) +=head2 $self->action_namespace($c) =cut @@ -84,7 +85,7 @@ sub action_namespace { || ''; } -=item $self->register_actions($c) +=head2 $self->register_actions($c) =cut @@ -152,8 +153,6 @@ sub _parse_attrs { return \%attributes; } -=back - =head1 SEE ALSO L, L.