From: Sebastian Riedel <sri@labs.kraih.com>
Date: Sat, 19 Mar 2005 17:22:08 +0000 (+0000)
Subject: fixed isa tree
X-Git-Tag: 5.7099_04~1760
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=502619e59524272fc07491f9d2d6958304df3fa4

fixed isa tree
---

diff --git a/Changes b/Changes
index a31268b..d680e75 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,8 @@
 This file documents the revision history for Perl extension Catalyst.
 
+4.28  XXX XXX XX XX:00:00 2005
+        - fixed isa tree (Christian Hansen)
+
 4.27  Sat Mar 19 01:00:00 2005
         - debug message for parameters
         - some random fixes
diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 9a629fc..d238867 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.27';
+our $VERSION = '4.28';
 our @ISA;
 
 =head1 NAME
@@ -161,7 +161,8 @@ sub import {
             else {
                 $caller->log->debug(qq/Loaded plugin "$plugin"/)
                   if $caller->debug;
-                unshift @ISA, $plugin;
+                no strict 'refs';
+                push @{"$caller\::ISA"}, $plugin;
             }
         }
     }
@@ -171,7 +172,10 @@ sub import {
       if $ENV{CATALYST_ENGINE};
     $engine->require;
     die qq/Couldn't load engine "$engine", "$@"/ if $@;
-    push @ISA, $engine;
+    {
+        no strict 'refs';
+        push @{"$caller\::ISA"}, $engine;
+    }
     $caller->log->debug(qq/Loaded engine "$engine"/) if $caller->debug;
 }
 
@@ -197,9 +201,9 @@ Sebastian Riedel, C<sri@oook.de>
 
 =head1 THANK YOU
 
-Andrew Ruthven, 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 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