X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst.pm;h=4de968406c18f81b20929d48a078c2c863db9d9c;hp=59b30c29a6a0f9893471da78a00b3d0683be662f;hb=b710ca30f0287e9a895c71f28e0a8acbe0b72a1d;hpb=6a0648863b2a3a4a745dc701d422b954cadc05b0 diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm index 59b30c2..4de9684 100644 --- a/lib/Catalyst.pm +++ b/lib/Catalyst.pm @@ -59,7 +59,7 @@ __PACKAGE__->engine_class('Catalyst::Engine::CGI'); __PACKAGE__->request_class('Catalyst::Request'); __PACKAGE__->response_class('Catalyst::Response'); -our $VERSION = '5.62'; +our $VERSION = '6.00'; sub import { my ( $class, @arguments ) = @_; @@ -937,14 +937,14 @@ sub execute { # this is done by walking up the call stack and looking for a calling # sub of Catalyst::forward before the eval my $callsub = q{}; - for my $index (1..10) { - last - if ( ( caller($index) )[0] eq 'Catalyst' + for my $index ( 1 .. 10 ) { + last + if ( ( caller($index) )[0] eq 'Catalyst' && ( caller($index) )[3] eq '(eval)' ); - - if ( (caller($index))[3] =~ /forward$/ ) { - $callsub = (caller($index))[3]; - $action = "-> $action"; + + if ( ( caller($index) )[3] =~ /forward$/ ) { + $callsub = ( caller($index) )[3]; + $action = "-> $action"; last; } }