From 4dbab3a4c564f1e495716ce72882896d79e44772 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 1 Dec 2015 10:16:43 +0000 Subject: [PATCH] [PASSED QA] Bug 15270: Make Koha::Objects->find return undef instead of crashing On 3.20.05, if AnonymousPatron is set to a nonexistent borrowernumber, the about.pl crashes with DBIC result type isn't of the type Borrower at /home/koha/src/Koha/Objects.pm line 87. This was fixed on master by commit 6882949b1b3bd1284e3d2877244a64edee3883ca Date: Wed Apr 8 06:38:34 2015 -0400 Bug 13967 - System preferences need a package Test plan: Set the AnonymousPatron pref to a nonexistent borrowernumber Go on about.pl Without this patch, you get the error. Signed-off-by: Magnus Enger Set AnonymousPatron pref to a nonexistent borrowernumber. Before the patch, about.pl shows a nasty error. After applying the patch the error is gone. Tests in t/db_dependent/Objects.t pass. Signed-off-by: Katrin Fischer --- Koha/Objects.pm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Koha/Objects.pm b/Koha/Objects.pm index f347157..8ef6390 100644 --- a/Koha/Objects.pm +++ b/Koha/Objects.pm @@ -84,6 +84,8 @@ sub find { my $result = $self->_resultset()->find($id); + return unless $result; + my $object = $self->object_class()->_new_from_dbic( $result ); return $object; -- 1.9.1