diff --git a/Koha/Plugins.pm b/Koha/Plugins.pm index 8d6957a298..092c5e01b7 100644 --- a/Koha/Plugins.pm +++ b/Koha/Plugins.pm @@ -19,6 +19,7 @@ package Koha::Plugins; use Modern::Perl; +use Array::Utils qw(array_minus); use Class::Inspector; use List::MoreUtils qw(any); use Module::Load::Conditional qw(can_load); @@ -32,7 +33,7 @@ use Koha::Plugins::Methods; BEGIN { my $pluginsdir = C4::Context->config("pluginsdir"); my @pluginsdir = ref($pluginsdir) eq 'ARRAY' ? @$pluginsdir : $pluginsdir; - push( @INC, @pluginsdir ); + push @INC, array_minus(@pluginsdir, @INC) ; pop @INC if $INC[-1] eq '.'; } diff --git a/Koha/Plugins/Handler.pm b/Koha/Plugins/Handler.pm index aa4970c6fc..6c6ae73023 100644 --- a/Koha/Plugins/Handler.pm +++ b/Koha/Plugins/Handler.pm @@ -19,6 +19,7 @@ package Koha::Plugins::Handler; use Modern::Perl; +use Array::Utils qw(array_minus); use File::Path qw(remove_tree); use Module::Load qw(load); @@ -29,7 +30,7 @@ use Koha::Plugins::Methods; BEGIN { my $pluginsdir = C4::Context->config("pluginsdir"); my @pluginsdir = ref($pluginsdir) eq 'ARRAY' ? @$pluginsdir : $pluginsdir; - push( @INC, @pluginsdir ); + push @INC, array_minus(@pluginsdir, @INC) ; pop @INC if $INC[-1] eq '.' ; }