X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FAttrContainer.pm;h=6ae22679b9ad29f4c7d850a147bc9131f5031ab7;hb=d666af81cece84d49c57bb91949641937ad57091;hp=c7eb129355c370f1c962b2905fae048350889f0c;hpb=ba599d1c7a0c3219cd3825264c44d22362ed179a;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/AttrContainer.pm b/lib/Catalyst/AttrContainer.pm
index c7eb129..6ae2267 100644
--- a/lib/Catalyst/AttrContainer.pm
+++ b/lib/Catalyst/AttrContainer.pm
@@ -1,7 +1,7 @@
 package Catalyst::AttrContainer;
 
 use strict;
-use base qw/Class::Data::Inheritable Class::Accessor::Fast/;
+use base qw/Class::Accessor::Fast Class::Data::Inheritable/;
 
 use Catalyst::Exception;
 use NEXT;
@@ -13,8 +13,9 @@ __PACKAGE__->_action_cache( [] );
 # note - see attributes(3pm)
 sub MODIFY_CODE_ATTRIBUTES {
     my ( $class, $code, @attrs ) = @_;
-    $class->_attr_cache->{$code} = [@attrs];
-    push @{ $class->_action_cache }, [ $code, [@attrs] ];
+    $class->_attr_cache( { %{ $class->_attr_cache }, $code => [@attrs] } );
+    $class->_action_cache(
+        [ @{ $class->_action_cache }, [ $code, [@attrs] ] ] );
     return ();
 }
 
@@ -28,15 +29,18 @@ Catalyst::AttrContainer
 
 =head1 DESCRIPTION
 
+This class sets up the code attribute cache.  It's a base class for 
+L<Catalyst::Base>
+
 =head1 METHODS
 
-=over 4
+=head2 FETCH_CODE_ATTRIBUTES
 
-=item FETCH_CODE_ATTRIBUTES
+Attribute function. See attributes(3pm)
 
-=item MODIFY_CODE_ATTRIBUTES
+=head2 MODIFY_CODE_ATTRIBUTES
 
-=back
+Attribute function. See attributes(3pm)
 
 =head1 SEE ALSO