From: Sebastian Riedel Date: Fri, 13 Jan 2006 02:20:15 +0000 (+0000) Subject: Updated version to 6.00 :) X-Git-Tag: 5.7099_04~752 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=b710ca30f0287e9a895c71f28e0a8acbe0b72a1d;hp=6a0648863b2a3a4a745dc701d422b954cadc05b0 Updated version to 6.00 :) --- diff --git a/Changes b/Changes index 79b8b6d..d2e31b4 100644 --- a/Changes +++ b/Changes @@ -1,6 +1,6 @@ This file documents the revision history for Perl extension Catalyst. -5.62 +6.00 - Added YAML config support - Added COMPONENT() and ACCEPT_CONTEXT() support - Action list in debug mode is now displayed as a tree in the 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; } }