X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FAction.pm;h=6758e862243f94c3960d896bacd492fe86f9c146;hb=6a7254b57957f4f40cee98226a93b012c5427cfe;hp=2023303746035233aa6aa79806bbfa412cad320b;hpb=5fb12dbb7e69039e0ea22ec4d7cb627206b4508b;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst/Action.pm b/lib/Catalyst/Action.pm index 2023303..6758e86 100644 --- a/lib/Catalyst/Action.pm +++ b/lib/Catalyst/Action.pm @@ -32,32 +32,19 @@ no warnings 'recursion'; #__PACKAGE__->mk_accessors(qw/class namespace reverse attributes name code/); -use overload ( - - # Stringify to reverse for debug output etc. - q{""} => sub { shift->reverse() }, - - # Codulate to execute to invoke the encapsulated action coderef - '&{}' => sub { my $self = shift; sub { $self->execute(@_); }; }, - - # Make general $stuff still work - fallback => 1, - -); - sub dispatch { # Execute ourselves against a context my ( $self, $c ) = @_; #Moose todo: grrrrrr. this is no good. i don't know enough about it to # debug it though. why can't we just call the accessor? - local $c->{namespace} = $self->namespace; - return $c->execute( $self->class, $self ); + #local $c->{namespace} = $self->namespace; + #return $c->execute( $self->class, $self ); #believed to be equivalent: - #my $orig = $c->namespace; - #$c->namespace($self->namespace); - #my $ret = $c->execute( $self->class, $self ); - #$c->namespace($orig); - #return $ret; + my $orig = $c->namespace; + $c->namespace($self->namespace); + my $ret = $c->execute( $self->class, $self ); + $c->namespace($orig); + return $ret; } sub execute {