From 101537bcf711e0e8c064273a6a3c19c580961d21 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Fri, 22 Mar 2013 01:31:44 -0700 Subject: [PATCH] Bug 9883 - Koha::Plugins::* should not require koha-conf to load - Followup - Load C4::Auth at run time --- C4/Installer/PerlDependencies.pm | 5 +++++ Koha/Plugins/Base.pm | 3 ++- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/C4/Installer/PerlDependencies.pm b/C4/Installer/PerlDependencies.pm index 535a377..bc51028 100644 --- a/C4/Installer/PerlDependencies.pm +++ b/C4/Installer/PerlDependencies.pm @@ -674,6 +674,11 @@ our $PERL_DEPS = { 'required' => '0', 'min_ver' => '3.9', }, + 'Module::Load' => { + 'usage' => 'Plugins', + 'required' => '0', + 'min_ver' => '0.16', + }, }; 1; diff --git a/Koha/Plugins/Base.pm b/Koha/Plugins/Base.pm index 3b0ab15..776f698 100644 --- a/Koha/Plugins/Base.pm +++ b/Koha/Plugins/Base.pm @@ -20,13 +20,14 @@ package Koha::Plugins::Base; use Modern::Perl; use Module::Pluggable require => 1; +use Module::Load; use base qw{Module::Bundled::Files}; use C4::Context; -use C4::Auth; BEGIN { + load C4::Auth; push @INC, C4::Context->config("pluginsdir"); } -- 1.7.2.5