From: Sebastian Riedel <sri@labs.kraih.com>
Date: Tue, 15 Nov 2005 18:59:32 +0000 (+0000)
Subject: Fixed typo
X-Git-Tag: 5.7099_04~911
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=8b76bfcf2b7d98cd72fc7ba702a15684bdee06f0

Fixed typo
---

diff --git a/lib/Catalyst/Base.pm b/lib/Catalyst/Base.pm
index 1b672f0..9aa4dbf 100644
--- a/lib/Catalyst/Base.pm
+++ b/lib/Catalyst/Base.pm
@@ -43,7 +43,10 @@ sub _AUTO : Private {
 
 sub _ACTION : Private {
     my ( $self, $c ) = @_;
-    if ( ref $c->action && $c->action->isa('Catalyst::Action') ) {
+    if (   ref $c->action
+        && $c->action->isa('Catalyst::Action')
+        && $c->req->action )
+    {
         $c->action->execute($c);
     }
     return !@{ $c->error };
diff --git a/lib/Catalyst/Request.pm b/lib/Catalyst/Request.pm
index c0cc729..b8caa11 100644
--- a/lib/Catalyst/Request.pm
+++ b/lib/Catalyst/Request.pm
@@ -6,7 +6,7 @@ use base 'Class::Accessor::Fast';
 use IO::Socket qw[AF_INET inet_aton];
 
 __PACKAGE__->mk_accessors(
-    qw/address arguments cookies headers match method
+    qw/action address arguments cookies headers match method
       protocol query_parameters secure snippets uri user/
 );
 
@@ -81,10 +81,6 @@ thus hiding the details of the particular engine implementation.
 
 Returns the requested action as a L<Catalyst::Action> object.
 
-=cut
-
-sub action { shift->{_context}->action(@_) }
-
 =item $req->address
 
 Returns the IP address of the client.