X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FDispatchType%2FDefault.pm;h=62308c32b277949926e2a747805704cbea4a9624;hb=640faa87f0c572b58acd22124bfa6f6c59106873;hp=08a49487627829fa1ad281d211d1d4312791ff54;hpb=ba599d1c7a0c3219cd3825264c44d22362ed179a;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst/DispatchType/Default.pm b/lib/Catalyst/DispatchType/Default.pm index 08a4948..62308c3 100644 --- a/lib/Catalyst/DispatchType/Default.pm +++ b/lib/Catalyst/DispatchType/Default.pm @@ -24,15 +24,16 @@ See L. sub match { my ( $self, $c, $path ) = @_; return if $path =~ m!/!; # Not at root yet, wait for it ... - my $result = @{ $c->get_action( 'default', $c->req->path, 1 ) || [] }[-1]; + my $result = ( $c->get_actions( 'default', $c->req->path ) )[-1]; # Find default on namespace or super if ($result) { - $c->action( $result->[0] ); - $c->namespace( $result->[0]->namespace ); + $c->action($result); + $c->namespace( $result->namespace ); $c->req->action('default'); + # default methods receive the controller name as the first argument - unshift @{ $c->req->args }, $path; + unshift @{ $c->req->args }, $path if $path; $c->req->match(''); return 1; }