Bug 14330: Remove unused email_sender from sendbasket/sendshelf

[koha.git] / Koha / Objects.pm

diff --git a/Koha/Objects.pm b/Koha/Objects.pm
index 6b3100a..8ef6390 100644 (file)
--- 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;
@@ -96,17 +98,17 @@ my @objects = Koha::Objects->search($params);
 =cut
 
 sub search {
-    my ( $self, $params ) = @_;
+    my ( $self, $params, $attributes ) = @_;
 
     if (wantarray) {
-        my @dbic_rows = $self->_resultset()->search($params);
+        my @dbic_rows = $self->_resultset()->search($params, $attributes);
 
         return $self->_wrap(@dbic_rows);
 
     }
     else {
         my $class = ref($self) ? ref($self) : $self;
-        my $rs = $self->_resultset()->search($params);
+        my $rs = $self->_resultset()->search($params, $attributes);
 
         return $class->_new_from_dbic($rs);
     }