From 68bbe3fb0d8238bf651d335d5a8dbaf72156f3ee Mon Sep 17 00:00:00 2001 From: Aleisha Amohia Date: Wed, 30 Aug 2017 23:54:56 +0000 Subject: [PATCH] Bug 19214: Prevent crash if ->club or ->patron is called in list context To test: 1) Create a club template and a club. 2) Add a user to the club 3) Log in to the OPAC as that user 4) Go to 'your summary' and click the Clubs tab 5) Notice clubs do not load and a warn shows: Template process failed: undef error - Cannot use "->find" in list context at /home/vagrant/kohaclone/Koha/Club/Enrollment.pm line 62. 6) Go to the staff side and go to the member page of that user 7) Go to 'details' and click the Clubs tab 8) Notice clubs do not load and a warn shows: Template process failed: undef error - Cannot use "->find" in list context at /home/vagrant/kohaclone/Koha/Club/Enrollment.pm line 71. 9) Apply patch 1) Repeat steps 4-7, confirming the errors do not show and clubs info loads correctly Sponsored-by: Catalyst IT Signed-off-by: Mark Tompsett Signed-off-by: Jonathan Druart Signed-off-by: Jonathan Druart (cherry picked from commit 594c48fb5b2c03f5d638d7115e42820294e32343) Signed-off-by: Fridolin Somers --- Koha/Club/Enrollment.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Koha/Club/Enrollment.pm b/Koha/Club/Enrollment.pm index 788f956984..168f55bca6 100644 --- a/Koha/Club/Enrollment.pm +++ b/Koha/Club/Enrollment.pm @@ -59,7 +59,7 @@ sub cancel { sub club { my ( $self ) = @_; - return Koha::Clubs->find( $self->club_id() ); + return scalar Koha::Clubs->find( $self->club_id() ); } =head3 patron @@ -68,7 +68,7 @@ sub club { sub patron { my ( $self ) = @_; - return Koha::Patrons->find( $self->borrowernumber() ); + return scalar Koha::Patrons->find( $self->borrowernumber() ); } =head3 type -- 2.39.2