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=08a49487627829fa1ad281d211d1d4312791ff54;hb=4082e67814e85bc9820e56eb38e5e21511c0a5f8;hpb=ba599d1c7a0c3219cd3825264c44d22362ed179a

diff --git a/lib/Catalyst/DispatchType/Default.pm b/lib/Catalyst/DispatchType/Default.pm
index 08a4948..abe887e 100644
--- a/lib/Catalyst/DispatchType/Default.pm
+++ b/lib/Catalyst/DispatchType/Default.pm
@@ -15,32 +15,29 @@ See L<Catalyst>.
 
 =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_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 );
+    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