X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=lib%2FMaypole%2FApplication.pm;h=f05379d87c8ab8035118aac9ff6fb8dc44b86d62;hb=e2b69c307c7c3de37c692f436742203d8f3bd5ee;hp=cd4318f9c48f786f1490225eccea642064d6553a;hpb=284a7d7e5af74cc6979378cb428c20ef98b4068c;p=maypole.git diff --git a/lib/Maypole/Application.pm b/lib/Maypole/Application.pm index cd4318f..f05379d 100644 --- 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 {