View | Details | Raw Unified | Return to bug 26434
Collapse All | Expand All

(-)a/Koha/Plugins.pm (-1 / +2 lines)
Lines 19-24 package Koha::Plugins; Link Here
19
19
20
use Modern::Perl;
20
use Modern::Perl;
21
21
22
use Array::Utils qw(array_minus);
22
use Class::Inspector;
23
use Class::Inspector;
23
use List::MoreUtils qw(any);
24
use List::MoreUtils qw(any);
24
use Module::Load::Conditional qw(can_load);
25
use Module::Load::Conditional qw(can_load);
Lines 32-38 use Koha::Plugins::Methods; Link Here
32
BEGIN {
33
BEGIN {
33
    my $pluginsdir = C4::Context->config("pluginsdir");
34
    my $pluginsdir = C4::Context->config("pluginsdir");
34
    my @pluginsdir = ref($pluginsdir) eq 'ARRAY' ? @$pluginsdir : $pluginsdir;
35
    my @pluginsdir = ref($pluginsdir) eq 'ARRAY' ? @$pluginsdir : $pluginsdir;
35
    push( @INC, @pluginsdir );
36
    push @INC, array_minus(@pluginsdir, @INC) ;
36
    pop @INC if $INC[-1] eq '.';
37
    pop @INC if $INC[-1] eq '.';
37
}
38
}
38
39
(-)a/Koha/Plugins/Handler.pm (-2 / +2 lines)
Lines 19-24 package Koha::Plugins::Handler; Link Here
19
19
20
use Modern::Perl;
20
use Modern::Perl;
21
21
22
use Array::Utils qw(array_minus);
22
use File::Path qw(remove_tree);
23
use File::Path qw(remove_tree);
23
24
24
use Module::Load qw(load);
25
use Module::Load qw(load);
Lines 29-35 use Koha::Plugins::Methods; Link Here
29
BEGIN {
30
BEGIN {
30
    my $pluginsdir = C4::Context->config("pluginsdir");
31
    my $pluginsdir = C4::Context->config("pluginsdir");
31
    my @pluginsdir = ref($pluginsdir) eq 'ARRAY' ? @$pluginsdir : $pluginsdir;
32
    my @pluginsdir = ref($pluginsdir) eq 'ARRAY' ? @$pluginsdir : $pluginsdir;
32
    push( @INC, @pluginsdir );
33
    push @INC, array_minus(@pluginsdir, @INC) ;
33
    pop @INC if $INC[-1] eq '.' ;
34
    pop @INC if $INC[-1] eq '.' ;
34
}
35
}
35
36
36
- 

Return to bug 26434