From 4ab854495f2e66f1b66b4456789d7f878f4b39d0 Mon Sep 17 00:00:00 2001
From: Ere Maijala <ere.maijala@helsinki.fi>
Date: Fri, 18 Mar 2016 17:02:50 +0200
Subject: [PATCH] Don't try to load record with empty id.
---
module/VuFind/src/VuFind/Record/Loader.php | 33 +++++++++++++---------
1 file changed, 19 insertions(+), 14 deletions(-)
diff --git a/module/VuFind/src/VuFind/Record/Loader.php b/module/VuFind/src/VuFind/Record/Loader.php
index 8a50e915c51..68580fe7e11 100644
--- a/module/VuFind/src/VuFind/Record/Loader.php
+++ b/module/VuFind/src/VuFind/Record/Loader.php
@@ -95,21 +95,26 @@ class Loader
public function load($id, $source = DEFAULT_SEARCH_BACKEND,
$tolerateMissing = false
) {
- $results = [];
- if (null !== $this->recordCache && $this->recordCache->isPrimary($source)) {
- $results = $this->recordCache->lookup($id, $source);
- }
- if (empty($results)) {
- $results = $this->searchService->retrieve($source, $id)->getRecords();
- }
- if (empty($results) && null !== $this->recordCache
- && $this->recordCache->isFallback($source)
- ) {
- $results = $this->recordCache->lookup($id, $source);
- }
+ if (null !== $id && '' !== $id) {
+ $results = [];
+ if (null !== $this->recordCache
+ && $this->recordCache->isPrimary($source)
+ ) {
+ $results = $this->recordCache->lookup($id, $source);
+ }
+ if (empty($results)) {
+ $results = $this->searchService->retrieve($source, $id)
+ ->getRecords();
+ }
+ if (empty($results) && null !== $this->recordCache
+ && $this->recordCache->isFallback($source)
+ ) {
+ $results = $this->recordCache->lookup($id, $source);
+ }
- if (!empty($results)) {
- return $results[0];
+ if (!empty($results)) {
+ return $results[0];
+ }
}
if ($tolerateMissing) {
$record = $this->recordFactory->get('Missing');
--
GitLab