X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FDispatchType%2FDefault.pm;h=fc734dd44c66ae8b3dd4ca8355196c859e54a82b;hb=6b49572336514157cdddf44ca9b9c80886c842f6;hp=f1864b2f85b44e8b870777ae1f4f048656daf991;hpb=b5ecfcf07b8ffe7e9984f0279c8781ce51c6ac6a;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst/DispatchType/Default.pm b/lib/Catalyst/DispatchType/Default.pm index f1864b2..fc734dd 100644 --- a/lib/Catalyst/DispatchType/Default.pm +++ b/lib/Catalyst/DispatchType/Default.pm @@ -17,6 +17,13 @@ See L. =head2 $self->match( $c, $path ) +If path is empty (i.e. all path parts have been converted into args), +attempts to find a default for the namespace constructed from the args, +or the last inherited default otherwise and will match that. + +If path is not empty, never matches since Default will only match if all +other possibilities have been exhausted. + =cut sub match { @@ -25,7 +32,7 @@ sub match { my $result = ( $c->get_actions( 'default', $c->req->path ) )[-1]; # Find default on namespace or super - if ($result) { + if ($result && $result->match($c)) { $c->action($result); $c->namespace( $result->namespace ); $c->req->action('default');