gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 6efd0a5704.

Signed-off-by: Victor Grousset/tuxayo <victor@tuxayo.net>
This commit is contained in:
Victor Grousset/tuxayo 2020-10-27 13:10:38 +01:00
parent a5b8547f15
commit a820ff385d
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Koha/Plugins.pm
View File

@ -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 '.';
}

3
Koha/Plugins/Handler.pm
View File

@ -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 '.' ;
}