From 2a908ee7151cf23b2059a82b5a5c0b447afe73d5 Mon Sep 17 00:00:00 2001 From: Petro Vashchuk Date: Mon, 29 Mar 2021 16:58:25 +0300 Subject: [PATCH] Bug 25946: borrowerRelationship can be empty Do not split the config using comma. From syspref description of borrowerRelationship preference: > Guarantors can be the following of those they guarantee: > (input multiple choices separated by |). Leave empty to deactivate. As it doesn't mention comma at all, I removed ',' from split. Of course if comma is actually a viable way to split separate choices, I can obsolete this patch and append to the syspref description that it also can be separated by comma. Signed-off-by: Andrew Fuerste-Henry Signed-off-by: Martin Renvoize Signed-off-by: Jonathan Druart (cherry picked from commit 4490dfdf089c1e1eef44bfd4c71b84e7e9c8610a) Signed-off-by: Fridolin Somers --- Koha/Patron/Relationship.pm | 2 +- members/memberentry.pl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Koha/Patron/Relationship.pm b/Koha/Patron/Relationship.pm index 4bce8c93ca..1058f27cac 100644 --- a/Koha/Patron/Relationship.pm +++ b/Koha/Patron/Relationship.pm @@ -48,7 +48,7 @@ Overloaded method that makes some checks before storing on the DB sub store { my ( $self ) = @_; - my @valid_relationships = split /,|\|/, C4::Context->preference('borrowerRelationship'); + my @valid_relationships = split /\|/, C4::Context->preference('borrowerRelationship'); Koha::Exceptions::Patron::Relationship::InvalidRelationship->throw( no_relationship => 1 ) diff --git a/members/memberentry.pl b/members/memberentry.pl index e6be7854a0..462cebd7a1 100755 --- a/members/memberentry.pl +++ b/members/memberentry.pl @@ -107,7 +107,7 @@ my @messages; ## Deal with guarantor stuff $template->param( relationships => scalar $patron->guarantor_relationships ) if $patron; -my @relations = split /,|\|/, C4::Context->preference('borrowerRelationship'); +my @relations = split /\|/, C4::Context->preference('borrowerRelationship'); my $empty_relationship_allowed = grep {$_ eq ""} @relations; $template->param( empty_relationship_allowed => $empty_relationship_allowed ); -- 2.39.5