From 631294e8aa35b974d84877fd8d73fd9229ca0d36 Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Wed, 8 Nov 2017 16:37:52 -0300 Subject: [PATCH] Bug 7317: Remove traces of UnmediatedILL This patch removes references to UnmediatedILL. This feature is introduced on a separate bug. Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart --- Koha/Illrequest/Config.pm | 8 ++------ t/db_dependent/Illrequest/Config.t | 2 -- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/Koha/Illrequest/Config.pm b/Koha/Illrequest/Config.pm index 776cb99f33..28e80ce0f6 100644 --- a/Koha/Illrequest/Config.pm +++ b/Koha/Illrequest/Config.pm @@ -64,8 +64,7 @@ sub new { my $self = {}; $self->{configuration} = _load_configuration( - C4::Context->config("interlibrary_loans"), - C4::Context->preference("UnmediatedILL") + C4::Context->config("interlibrary_loans") ); bless $self, $class; @@ -230,7 +229,7 @@ file to ensure we have only valid input there. =cut sub _load_configuration { - my ( $xml_config, $unmediated ) = @_; + my ( $xml_config ) = @_; my $xml_backend_dir = $xml_config->{backend_directory}; # Default data structure to be returned @@ -309,9 +308,6 @@ sub _load_configuration { # ILL Partners $configuration->{partner_code} = $xml_config->{partner_code} || 'ILLLIBS'; - die "No DEFAULT_FORMATS has been defined in koha-conf.xml, but UNMEDIATEDILL is active." - if ( $unmediated && !$configuration->{default_formats}->{default} ); - return $configuration; } diff --git a/t/db_dependent/Illrequest/Config.t b/t/db_dependent/Illrequest/Config.t index f44fa85cfd..3f26c6b855 100644 --- a/t/db_dependent/Illrequest/Config.t +++ b/t/db_dependent/Illrequest/Config.t @@ -43,7 +43,6 @@ subtest 'Basics' => sub { $schema->storage->txn_begin; - t::lib::Mocks::mock_preference("UnmediatedILL", 0); t::lib::Mocks::mock_config("interlibrary_loans", {}); my $config = Koha::Illrequest::Config->new; @@ -415,7 +414,6 @@ subtest 'Final tests' => sub { $schema->storage->txn_begin; - t::lib::Mocks::mock_preference("UnmediatedILL", 0); t::lib::Mocks::mock_config("interlibrary_loans", {}); my $config = Koha::Illrequest::Config->new; -- 2.39.5