X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst.pm;h=c55563f7a0816a936f96dd0b60b46f9f36155c0c;hb=1c99e1250cfd5cdefb5f36bd08b974c9384412e5;hp=d2051837233552ff3dde813a852242c426cc0bb7;hpb=23f9d93414eadb11350029f13b51841d8309363b;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index d205183..c55563f 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -7,7 +7,7 @@ use Catalyst::Log;
 
 __PACKAGE__->mk_classdata($_) for qw/_config log/;
 
-our $VERSION = '4.28';
+our $VERSION = '4.31';
 our @ISA;
 
 =head1 NAME
@@ -146,9 +146,15 @@ sub import {
         no strict 'refs';
         *{"$caller\::handler"} =
           sub { Catalyst::Engine::handler( $caller, @_ ) };
-        push @{"$caller\::ISA"}, $self;
+
+        unless ( $caller->isa($self) ) {
+            push @{"$caller\::ISA"}, $self;
+        }
+    }
+
+    unless ( $self->log ) {
+        $self->log( Catalyst::Log->new );
     }
-    $self->log( Catalyst::Log->new );
 
     # Options
     my $engine =
@@ -157,7 +163,7 @@ sub import {
         if (/^\-Debug$/) {
             no warnings;
             no strict 'refs';
-            *{"$self\::debug"} = sub { 1 };
+            *{"$caller\::debug"} = sub { 1 };
             $caller->log->debug('Debug messages enabled');
         }
         elsif (/^-Engine=(.*)$/) { $engine = "Catalyst::Engine::$1" }
@@ -215,9 +221,10 @@ Sebastian Riedel, C<sri@oook.de>
 
 =head1 THANK YOU
 
-Andrew Ruthven, Christian Hansen, Christopher Hicks, Danijel Milicevic,
-David Naughton, Gary Ashton Jones, Jesse Sheidlower, Johan Lindstrom,
-Marcus Ramberg, Tatsuhiko Miyagawa and all the others who've helped.
+Andrew Ford, Andrew Ruthven, Christian Hansen, Christopher Hicks,
+Danijel Milicevic, David Naughton, Gary Ashton Jones, Jesse Sheidlower,
+Johan Lindstrom, Marcus Ramberg, Tatsuhiko Miyagawa and all the others
+who've helped.
 
 =head1 LICENSE