X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst.pm;h=2c6ca19cb7543f6e62ed35a5db42ecb7938d85f5;hb=62d9b03003fb7bc4be52d27b67cf0edcaaf18162;hp=7523068e30bf46df92e8fbb68e8fd7270968e747;hpb=599b52952b28f527af103cdf9f134b09ccd522e3;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 7523068..2c6ca19 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -13,7 +13,7 @@ our $CATALYST_SCRIPT_GEN = 4;
 
 __PACKAGE__->mk_classdata($_) for qw/arguments dispatcher engine log/;
 
-our $VERSION = '5.24';
+our $VERSION = '5.31';
 our @ISA;
 
 =head1 NAME
@@ -126,17 +126,16 @@ Returns a hashref containing your applications settings.
 
 sub import {
     my ( $class, @arguments ) = @_;
-
+    
+    # We have to limit $class to Catalyst to avoid pushing Catalyst upon every
+    # callers @ISA.
     return unless $class eq 'Catalyst';
 
     my $caller = caller(0);
-    
-    # Prepare inheritance
-    unless ( $caller->isa($class) ) {
-        
+
+    unless ( $caller->isa('Catalyst') ) {
         no strict 'refs';
         push @{"$caller\::ISA"}, $class;
-        
     }
 
     $caller->arguments( [ @arguments ] );