X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst.pm;h=75652fb5771a3b1ce229bddf816605520deb1598;hb=b553e30c12cade787e4c26ca54f19983577bdb30;hp=2f0fb0d01b4f3a897e2d32dedf78562f94f7e3a2;hpb=62a6df80212f937ce5ecf1577b95d4946f43ed2b;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 2f0fb0d..75652fb 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -815,7 +815,7 @@ The config method is present on all Catalyst components, and configuration
 will be merged when an application is started. Configuration loaded with
 L<Catalyst::Plugin::ConfigLoader> takes precedence over other configuration,
 followed by configuration in your top level C<MyApp> class. These two
-configurations are merged, and then configuration data whos hash key matches a
+configurations are merged, and then configuration data whose hash key matches a
 component name is merged with configuration for that component.
 
 The configuration for a component is then passed to the C<new> method when a
@@ -2166,8 +2166,9 @@ sub setup_components {
 =cut
 
 sub _controller_init_base_classes {
-    my ($class, $component) = @_;
+    my ($app_class, $component) = @_;
     foreach my $class ( reverse @{ mro::get_linear_isa($component) } ) {
+        next unless $class =~ /^$app_class/;
         Moose->init_meta( for_class => $class )
             unless find_meta($class);
     }