X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMouse%2FMeta%2FClass.pm;h=765def82ec50fe707fcb1d682375c3c5cb16afc3;hb=8cf51b82d94aad02f81dc853be874e9a49a82c31;hp=93c78744008337e403f9d27379f868b19f24b28b;hpb=deb9a0f32002cd07012c50884a227335b93f1449;p=gitmo%2FMouse.git

diff --git a/lib/Mouse/Meta/Class.pm b/lib/Mouse/Meta/Class.pm
index 93c7874..765def8 100644
--- a/lib/Mouse/Meta/Class.pm
+++ b/lib/Mouse/Meta/Class.pm
@@ -27,7 +27,7 @@ sub _construct_meta {
     };
 
     my $self = bless \%args, ref($class) || $class;
-    if($class ne __PACKAGE__){
+    if(ref($self) ne __PACKAGE__){
         $self->meta->_initialize_object($self, \%args);
     }
     return $self;
@@ -104,6 +104,7 @@ sub add_attribute {
         if ($name =~ s/^\+//) { # inherited attributes
             my $inherited_attr;
 
+            # find_attribute_by_name
             foreach my $class($self->linearized_isa){
                 my $meta = Mouse::Util::get_metaclass_by_name($class) or next;
                 $inherited_attr = $meta->get_attribute($name) and last;
@@ -112,10 +113,10 @@ sub add_attribute {
             defined($inherited_attr)
                 or $self->throw_error("Could not find an attribute by the name of '$name' to inherit from in ".$self->name);
 
-            $attr = $inherited_attr->clone_and_inherit_options($name, \%args);
+            $attr = $inherited_attr->clone_and_inherit_options(%args);
         }
         else{
-            my($attribute_class, @traits) = $self->attribute_metaclass->interpolate_class($name, \%args);
+            my($attribute_class, @traits) = $self->attribute_metaclass->interpolate_class(\%args);
             $args{traits} = \@traits if @traits;
 
             $attr = $attribute_class->new($name, %args);