From c079d8fb89a2f0129d97b84c6d3057a44554ba1c Mon Sep 17 00:00:00 2001
From: Ere Maijala <ere.maijala@helsinki.fi>
Date: Tue, 15 Nov 2016 15:05:35 +0200
Subject: [PATCH] Return an empty array when concat is true and there are no
matches.
---
module/VuFind/src/VuFind/RecordDriver/SolrMarc.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/module/VuFind/src/VuFind/RecordDriver/SolrMarc.php b/module/VuFind/src/VuFind/RecordDriver/SolrMarc.php
index 1dd41657b98..9e788f26e80 100644
--- a/module/VuFind/src/VuFind/RecordDriver/SolrMarc.php
+++ b/module/VuFind/src/VuFind/RecordDriver/SolrMarc.php
@@ -509,7 +509,7 @@ class SolrMarc extends SolrDefault
// Loop through all subfields, collecting results that match the whitelist;
// note that it is important to retain the original MARC order here!
$allSubfields = $currentField->getSubfields();
- if (count($allSubfields) > 0) {
+ if (!empty($allSubfields)) {
foreach ($allSubfields as $currentSubfield) {
if (in_array($currentSubfield->getCode(), $subfields)) {
// Grab the current subfield value and act on it if it is
@@ -523,7 +523,7 @@ class SolrMarc extends SolrDefault
}
// Send back the data in a different format depending on $concat mode:
- return $concat ? [implode($separator, $matches)] : $matches;
+ return $concat && $matches ? [implode($separator, $matches)] : $matches;
}
/**
--
GitLab