X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst.pm;h=4afa241ab348e52eea348d7f79508ac5936df1a4;hb=a0eca83861c733269dbafbaafbcc3ca0b0101e2b;hp=528fbc5f94027b081267973d2782957325f053fa;hpb=480f3a1c0fd7dc5b5a6e5592cba8925b0b08b9e6;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 528fbc5..4afa241 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -843,7 +843,11 @@ sub execute {
     my ( $c, $class, $code ) = @_;
     $class = $c->components->{$class} || $class;
     $c->state(0);
-    my $callsub = ( caller(1) )[3];
+
+    my $callsub =
+        ( caller(0) )[0]->isa('Catalyst::Action')
+      ? ( caller(2) )[3]
+      : ( caller(1) )[3];
 
     my $action = '';
     if ( $c->debug ) {