X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst.pm;h=d46395d05e02bdc03cd908161872dd9f2dfc0108;hb=61bef2384fe7e5bf9c3050c441ebde61088aa1c6;hp=d2235de8c3440bc7c55a5415d40b271b55fdc7c2;hpb=94a6e0e40e4507a79c747bd41cbf9bfecdd58914;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm index d2235de..d46395d 100644 --- a/lib/Catalyst.pm +++ b/lib/Catalyst.pm @@ -18,6 +18,19 @@ use URI; use Scalar::Util qw/weaken/; use attributes; +# For PAR +require Catalyst::Helper; +require Catalyst::PAR; +require Catalyst::Build; +require Catalyst::Test; + +require Catalyst::Engine::HTTP; +require Catalyst::Engine::CGI; + +require Catalyst::Controller; +require Catalyst::Model; +require Catalyst::View; + __PACKAGE__->mk_accessors( qw/counter request response state action stack namespace/ ); @@ -43,7 +56,7 @@ our $DETACH = "catalyst_detach\n"; require Module::Pluggable::Fast; # Helper script generation -our $CATALYST_SCRIPT_GEN = 14; +our $CATALYST_SCRIPT_GEN = 18; __PACKAGE__->mk_classdata($_) for qw/components arguments dispatcher engine log dispatcher_class @@ -276,7 +289,9 @@ sub detach { my $c = shift; $c->dispatcher->detach( $c, @_ ) } =item $c->error($arrayref) -Returns an arrayref containing error messages. +Returns an arrayref containing error messages. If Catalyst encounters an +error while processing a request, it stores the error in $c->error. This +method should not be used to store non-fatal error messages. my @error = @{ $c->error }; @@ -284,7 +299,8 @@ Add a new error. $c->error('Something bad happened'); -Clear errors. +Clear errors. You probably don't want to clear the errors unless you are +implementing a custom error screen. $c->error(0); @@ -1914,6 +1930,8 @@ David Kamholz David Naughton +Drew Taylor + Gary Ashton Jones Geoff Richards