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=58779fa87f2f1ecb9f05ddf2378f582fc35aa2f6;hp=ff1f83ee2842ca5f54a619edf1716c0b6f198bcb;hb=4ab87e274ac0a05f98c10a4cdba467ba4398b0d3;hpb=2633d7dc3bb9c0cf7bf3e7cf936d6411fe3ba5aa

diff --git a/lib/Catalyst/DispatchType/Default.pm b/lib/Catalyst/DispatchType/Default.pm
index ff1f83e..58779fa 100644
--- a/lib/Catalyst/DispatchType/Default.pm
+++ b/lib/Catalyst/DispatchType/Default.pm
@@ -15,30 +15,32 @@ See L<Catalyst>.
 
 =head1 METHODS
 
-=over 4
+=head2 $self->match( $c, $path )
 
-=item $self->match( $c, $path )
+Check if default action matches, and set action if it does. 
+Will be called last for each controller.
 
 =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( $c->req->path );
+    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 if $path;
         $c->req->match('');
         return 1;
     }
     return 0;
 }
 
-=back
-
 =head1 AUTHOR
 
 Matt S Trout