- Moved local $c->{namespace} set to Catalyst::Action::execute to fix forward from...

diff --git a/lib/Catalyst/Action.pm b/lib/Catalyst/Action.pm
index 9b2ea9f..e8b5230 100644 (file)
--- a/lib/Catalyst/Action.pm
+++ b/lib/Catalyst/Action.pm
@@ -41,6 +41,7 @@ See L<Catalyst>.
 
 sub execute {    # Execute ourselves against a context
     my ( $self, $c ) = @_;
+    local $c->{namespace} = $self->namespace;
     return $c->execute( $self->class, $self );
 }
 

diff --git a/lib/Catalyst/Dispatcher.pm b/lib/Catalyst/Dispatcher.pm
index 966a4e2..d92c7dc 100644 (file)
--- a/lib/Catalyst/Dispatcher.pm
+++ b/lib/Catalyst/Dispatcher.pm
@@ -150,7 +150,6 @@ qq/Couldn't forward to command "$command". Invalid action or component./;
     }
 
     local $c->request->{arguments} = [ @{$arguments} ];
-    local $c->{namespace} = $result->namespace;
 
     $result->execute($c);