X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FComponent.pm;h=13ccb2c55c4ce74a447229ba93d91381bda7e57c;hb=e106a59f5b94228aa1df4cf2224e06c5ef53298b;hp=1301fc850b8f5241cc6c1a970747e10ab1d29df2;hpb=7e2ec16eafb1be1daead8ed4b975ab42b79e31cb;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst/Component.pm b/lib/Catalyst/Component.pm index 1301fc8..13ccb2c 100644 --- a/lib/Catalyst/Component.pm +++ b/lib/Catalyst/Component.pm @@ -7,6 +7,7 @@ use Catalyst::Utils; use Class::C3::Adopt::NEXT; use MRO::Compat; use mro 'c3'; +use Scalar::Util qw/blessed/; with 'MooseX::Emulate::Class::Accessor::Fast'; with 'Catalyst::ClassData'; @@ -99,7 +100,8 @@ sub config { # work in a subclass. If we don't have the package symbol in the # current class we know we need to copy up to ours, which calling # the setter will do for us. - my $meta = $self->Class::MOP::Object::meta(); + my $class = blessed($self) || $self; + my $meta = Class::MOP::get_metaclass_by_name($class); unless ($meta->has_package_symbol('$_config')) { $config = $self->merge_config_hashes( $config, {} );