X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst%2FComponent.pm;h=bb2a2013862a96664e4add663ae6338abc67d6d1;hp=f74709980a3140c6d1d0462f638cfa9783ab2d90;hb=e7399d8baa841cb6525daa2c20d88f70ba42474c;hpb=c80736fa195ad211ab3cf0f17d9907d67c1cb280 diff --git a/lib/Catalyst/Component.pm b/lib/Catalyst/Component.pm index f747099..bb2a201 100644 --- a/lib/Catalyst/Component.pm +++ b/lib/Catalyst/Component.pm @@ -9,6 +9,7 @@ use Devel::InnerPackage (); use MRO::Compat; use mro 'c3'; use Scalar::Util 'blessed'; +use Class::Load 'is_class_loaded'; use namespace::clean -except => 'meta'; with 'MooseX::Emulate::Class::Accessor::Fast'; @@ -93,7 +94,7 @@ sub BUILDARGS { } elsif (@_ == 2) { # is it ($app, $args) or foo => 'bar' ? if (blessed($_[0])) { $args = $_[1] if ref($_[1]) eq 'HASH'; - } elsif (Class::MOP::is_class_loaded($_[0]) && + } elsif (is_class_loaded($_[0]) && $_[0]->isa('Catalyst') && ref($_[1]) eq 'HASH') { $args = $_[1]; } else {