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=0703b5c102218b53e13c89c5ae5ec56b4d467487;hp=cbd95aef931cf1d6cdd7efbf56f7c5cc7908d22c;hb=a9dc674c99f36ff40d94b80753a1504074ba5e22;hpb=b0bb11ec8c056e043e87cd7733125ffc9d9bcfb0 diff --git a/lib/Catalyst/Base.pm b/lib/Catalyst/Base.pm index cbd95ae..0703b5c 100644 --- a/lib/Catalyst/Base.pm +++ b/lib/Catalyst/Base.pm @@ -22,17 +22,17 @@ sub _DISPATCH : Private { sub _BEGIN : Private { my ( $self, $c ) = @_; - my $begin = @{ $c->get_action( 'begin', $c->namespace, 1 ) }[-1]; + my $begin = ($c->get_actions( 'begin', $c->namespace))[-1]; return 1 unless $begin; - $begin->[0]->execute($c); + $begin->execute($c); return !@{ $c->error }; } sub _AUTO : Private { my ( $self, $c ) = @_; - my @auto = @{ $c->get_action( 'auto', $c->namespace, 1 ) }; + my @auto = $c->get_actions('auto', $c->namespace); foreach my $auto (@auto) { - $auto->[0]->execute($c); + $auto->execute($c); return 0 unless $c->state; } return 1; @@ -46,9 +46,9 @@ sub _ACTION : Private { sub _END : Private { my ( $self, $c ) = @_; - my $end = @{ $c->get_action( 'end', $c->namespace, 1 ) }[-1]; + my $end = ($c->get_actions( 'end', $c->namespace))[-1]; return 1 unless $end; - $end->[0]->execute($c); + $end->execute($c); return !@{ $c->error }; }