inheritance cleanup [bug 14120] in Maypole::Application

git-svn-id: http://svn.maypole.perl.org/Maypole/trunk@373 48953598-375a-da11-a14b-00016c27c3ee

diff --git a/lib/Maypole/Application.pm b/lib/Maypole/Application.pm
index cd4318f9c48f786f1490225eccea642064d6553a..f05379d87c8ab8035118aac9ff6fb8dc44b86d62 100644 (file)
--- a/lib/Maypole/Application.pm
+++ b/lib/Maypole/Application.pm
@@ -7,7 +7,7 @@ use Maypole;
 use Maypole::Config;
 
 our @ISA;
-our $VERSION = '2.09';
+our $VERSION = '2.11';
 
 sub import {
     my ( $class, @plugins ) = @_;
@@ -26,7 +26,8 @@ sub import {
     $frontend ||= 'CGI::Maypole';
     
     $frontend->require or die "Loading $frontend frontend failed: $@";
-    push @ISA, $frontend;
+    # inheritance may already be set up in a multi-app mod_perl environment
+    push @ISA, $frontend unless __PACKAGE__->isa( $frontend );
 
     my $autosetup=0;
     my @plugin_modules;
@@ -44,7 +45,6 @@ sub import {
                 my $plugin = "Maypole::Plugin::$_";
                 if ($plugin->require) {
                     push @plugin_modules, "Maypole::Plugin::$_";
-                   unshift @ISA, "Maypole::Plugin::$_";
                     warn "Loaded plugin: $plugin for $caller"
                         if $caller->can('debug') && $caller->debug;
                 } else {