From: Rafael Kitover Date: Sat, 30 May 2009 18:45:17 +0000 (+0000) Subject: fix mx::traits usage and update runtime dep X-Git-Tag: v0.26~14 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Model-DBIC-Schema.git;a=commitdiff_plain;h=60e01a60bd6bde1deb3092bd146f7568ca65f5e4 fix mx::traits usage and update runtime dep --- diff --git a/Makefile.PL b/Makefile.PL index 1a2cc7a..1cbc871 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -4,8 +4,8 @@ name 'Catalyst-Model-DBIC-Schema'; all_from 'lib/Catalyst/Model/DBIC/Schema.pm'; requires 'DBIx::Class' => '0.08103'; -requires 'Catalyst::Runtime' => '5.80003'; -requires 'MooseX::Traits' => '0.06'; +requires 'Catalyst::Runtime' => '5.80005'; +requires 'MooseX::Traits' => '0.05'; requires 'Moose'; requires 'Moose::Autobox'; requires 'MooseX::Types'; diff --git a/lib/Catalyst/Model/DBIC/Schema.pm b/lib/Catalyst/Model/DBIC/Schema.pm index 8095f05..7acec2c 100644 --- a/lib/Catalyst/Model/DBIC/Schema.pm +++ b/lib/Catalyst/Model/DBIC/Schema.pm @@ -472,13 +472,13 @@ sub COMPONENT { if (my $traits = delete $args->{traits}) { my @traits = $class->_resolve_traits($traits->flatten); - return $class->new_with_traits({ + return $class->new_with_traits( traits => \@traits, _original_class_name => $class, _traits => $traits, _resolved_traits => \@traits, %$args - }); + ); } return $class->new($args);