X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass.pm;h=1d055946658687fd33c00bac4c105d37bd598091;hb=aeb669b82b47ddabb73a36b9062d7cc616dcc112;hp=a835ae10e38ca85f937df1bad226303499cfa45c;hpb=c77ab576715790de93165cc5d2393b704349d809;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class.pm b/lib/DBIx/Class.pm index a835ae1..1d05594 100644 --- a/lib/DBIx/Class.pm +++ b/lib/DBIx/Class.pm @@ -27,7 +27,7 @@ sub component_base_class { 'DBIx::Class' } # Always remember to do all digits for the version even if they're 0 # i.e. first release of 0.XX *must* be 0.XX000. This avoids fBSD ports # brain damage and presumably various other packaging systems too -$VERSION = '0.08121'; +$VERSION = '0.08121_01'; $VERSION = eval $VERSION if $VERSION =~ /_/; # numify for warning-free dev releases @@ -42,8 +42,11 @@ sub MODIFY_CODE_ATTRIBUTES { sub _attr_cache { my $self = shift; my $cache = $self->can('__attr_cache') ? $self->__attr_cache : {}; - my $rest = eval { $self->next::method }; - return $@ ? $cache : { %$cache, %$rest }; + + return { + %$cache, + %{ $self->maybe::next::method || {} }, + }; } 1; @@ -65,9 +68,9 @@ The community can be found via: =item * RT Bug Tracker: L -=item * SVNWeb: L +=item * gitweb: L -=item * SVN: L +=item * git: L =back @@ -222,6 +225,8 @@ abraxxa: Alexander Hartmaier aherzog: Adam Herzog +Alexander Keusch + amoore: Andrew Moore andyg: Andy Grundman @@ -340,6 +345,8 @@ quicksilver: Jules Bean rafl: Florian Ragwitz +rbo: Robert Bohne + rbuels: Robert Buels rdj: Ryan D Johnson @@ -370,6 +377,8 @@ Todd Lipcon Tom Hukins +tonvoon: Ton Voon + triode: Pete Gamache typester: Daisuke Murase @@ -384,6 +393,8 @@ wreis: Wallace Reis zamolxes: Bogdan Lucaciu +Possum: Daniel LeWarne + =head1 COPYRIGHT Copyright (c) 2005 - 2010 the DBIx::Class L and L