From 1cf1c89f304fd2d84a1264041e8834444d1c8bf3 Mon Sep 17 00:00:00 2001
From: Chris Cormack <chrisc@catalyst.net.nz>
Date: Tue, 26 Jul 2016 08:57:50 +1200
Subject: [PATCH] Bug 16975 : @INC should not have '.' as its last entry
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

To Test
1/ Try using a plugin
2/ Apply patch
3/ Test plugin still works

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 28eae42d2d09c14d0bb1bd3e1655714b33711ab3)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
---
 Koha/Plugins.pm         | 1 +
 Koha/Plugins/Handler.pm | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Koha/Plugins.pm b/Koha/Plugins.pm
index bca7701134..a188d7c815 100644
--- a/Koha/Plugins.pm
+++ b/Koha/Plugins.pm
@@ -27,6 +27,7 @@ use C4::Output;
 
 BEGIN {
     push @INC, C4::Context->config("pluginsdir");
+    pop @INC if $INC[-1] eq '.';
 }
 
 =head1 NAME
diff --git a/Koha/Plugins/Handler.pm b/Koha/Plugins/Handler.pm
index 903b446261..0c0a7b476b 100644
--- a/Koha/Plugins/Handler.pm
+++ b/Koha/Plugins/Handler.pm
@@ -27,6 +27,7 @@ use C4::Context;
 
 BEGIN {
     push @INC, C4::Context->config("pluginsdir");
+     pop @INC if $INC[-1] eq '.' ;
 }
 
 =head1 NAME
-- 
2.39.5