Merge branch 'bug_9883' into 3.12-master

diff --git a/Koha/Plugins/Base.pm b/Koha/Plugins/Base.pm
index 3b0ab15..3a8dc63 100644 (file)
--- a/Koha/Plugins/Base.pm
+++ b/Koha/Plugins/Base.pm
@@ -24,11 +24,6 @@ use Module::Pluggable require => 1;
 use base qw{Module::Bundled::Files};
 
 use C4::Context;
-use C4::Auth;
-
-BEGIN {
-    push @INC, C4::Context->config("pluginsdir");
-}
 
 =head1 NAME
 
@@ -108,6 +103,8 @@ C4:Template, but at the moment, it does not.
 sub get_template {
     my ( $self, $args ) = @_;
 
+    require C4::Auth;
+
     my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         {   template_name   => $self->mbf_path( $args->{'file'} ),
             query           => $self->{'cgi'},

diff --git a/etc/koha-conf.xml b/etc/koha-conf.xml
index 73d67bf..22529ac 100644 (file)
--- a/etc/koha-conf.xml
+++ b/etc/koha-conf.xml
@@ -277,6 +277,7 @@ __PAZPAR2_TOGGLE_XML_POST__
  <authorityserver>authorities</authorityserver>
  <authorityservershadow>1</authorityservershadow>
  <pluginsdir>__PLUGINS_DIR__</pluginsdir>
+ <enable_plugins>0</enable_plugins>
  <intranetdir>__INTRANET_CGI_DIR__</intranetdir>
  <opacdir>__OPAC_CGI_DIR__/opac</opacdir>
  <opachtdocs>__OPAC_TMPL_DIR__</opachtdocs>