X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst%2FDispatchType%2FDefault.pm;h=abe887e357fba1a35adf521357425b2e233869b4;hp=dba3951fbceb410ccc4c3e4500b1d547a3f2c8bb;hb=4082e67814e85bc9820e56eb38e5e21511c0a5f8;hpb=a9dc674c99f36ff40d94b80753a1504074ba5e22 diff --git a/lib/Catalyst/DispatchType/Default.pm b/lib/Catalyst/DispatchType/Default.pm index dba3951..abe887e 100644 --- a/lib/Catalyst/DispatchType/Default.pm +++ b/lib/Catalyst/DispatchType/Default.pm @@ -15,32 +15,29 @@ See L. =head1 METHODS -=over 4 - -=item $self->match( $c, $path ) +=head2 $self->match( $c, $path ) =cut sub match { my ( $self, $c, $path ) = @_; return if $path =~ m!/!; # Not at root yet, wait for it ... - my $result = ($c->get_actions('default', $c->req->path))[-1]; + my $result = ( $c->get_actions( 'default', $c->req->path ) )[-1]; # Find default on namespace or super - if ($result) { - $c->action( $result ); + if ($result && $result->match($c)) { + $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; } return 0; } -=back - =head1 AUTHOR Matt S Trout