From a820ff385de4bc5ebeb0ac25209294ffd0f86969 Mon Sep 17 00:00:00 2001 From: Victor Grousset/tuxayo Date: Tue, 27 Oct 2020 13:10:38 +0100 Subject: [PATCH] Revert "Bug 26434: Fix plugin dirs addition to @INC" Due to new perl dep that is not yet available for 19.05.x So backport defered to next release. This reverts commit 6efd0a5704d246417d3a7b836b85a1e50437fd2a. Signed-off-by: Victor Grousset/tuxayo --- Koha/Plugins.pm | 3 +-- Koha/Plugins/Handler.pm | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Koha/Plugins.pm b/Koha/Plugins.pm index 000555dbfd..be6bf3304d 100644 --- a/Koha/Plugins.pm +++ b/Koha/Plugins.pm @@ -19,7 +19,6 @@ package Koha::Plugins; use Modern::Perl; -use Array::Utils qw(array_minus); use Module::Load::Conditional qw(can_load); use Module::Pluggable search_path => ['Koha::Plugin'], except => qr/::Edifact(|::Line|::Message|::Order|::Segment|::Transport)$/; use List::MoreUtils qw( any ); @@ -30,7 +29,7 @@ use C4::Output; BEGIN { my $pluginsdir = C4::Context->config("pluginsdir"); my @pluginsdir = ref($pluginsdir) eq 'ARRAY' ? @$pluginsdir : $pluginsdir; - push @INC, array_minus(@pluginsdir, @INC) ; + push( @INC, @pluginsdir ); pop @INC if $INC[-1] eq '.'; } diff --git a/Koha/Plugins/Handler.pm b/Koha/Plugins/Handler.pm index 32649e5fac..5b6e3e3787 100644 --- a/Koha/Plugins/Handler.pm +++ b/Koha/Plugins/Handler.pm @@ -19,7 +19,6 @@ package Koha::Plugins::Handler; use Modern::Perl; -use Array::Utils qw(array_minus); use File::Path qw(remove_tree); use Module::Load::Conditional qw(can_load); @@ -29,7 +28,7 @@ use C4::Context; BEGIN { my $pluginsdir = C4::Context->config("pluginsdir"); my @pluginsdir = ref($pluginsdir) eq 'ARRAY' ? @$pluginsdir : $pluginsdir; - push @INC, array_minus(@pluginsdir, @INC) ; + push( @INC, @pluginsdir ); pop @INC if $INC[-1] eq '.' ; } -- 2.39.5