From 4da911549bfb5e2b3f120c2d9f3ce68c5af5ec1c Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Thu, 23 Jan 2014 11:43:42 -0500
Subject: [PATCH] Avoid notices; resolves VUFIND-950.
---
.../blueprint/templates/Recommend/CollectionSideFacets.phtml | 3 ++-
themes/blueprint/templates/Recommend/SideFacets.phtml | 2 +-
.../bootstrap/templates/Recommend/CollectionSideFacets.phtml | 3 ++-
themes/bootstrap/templates/Recommend/SideFacets.phtml | 2 +-
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/themes/blueprint/templates/Recommend/CollectionSideFacets.phtml b/themes/blueprint/templates/Recommend/CollectionSideFacets.phtml
index 7ec7927674c..2bd168e5ab4 100644
--- a/themes/blueprint/templates/Recommend/CollectionSideFacets.phtml
+++ b/themes/blueprint/templates/Recommend/CollectionSideFacets.phtml
@@ -10,7 +10,8 @@
array(
'value' => $keywordFilter,
'displayText' => $keywordFilter,
- 'specialType' => 'keyword'
+ 'specialType' => 'keyword',
+ 'operator' => 'OR'
)
)
);
diff --git a/themes/blueprint/templates/Recommend/SideFacets.phtml b/themes/blueprint/templates/Recommend/SideFacets.phtml
index 695477f6155..a42055564f1 100644
--- a/themes/blueprint/templates/Recommend/SideFacets.phtml
+++ b/themes/blueprint/templates/Recommend/SideFacets.phtml
@@ -19,7 +19,7 @@
<? foreach ($filterList as $field => $filters): ?>
<? foreach ($filters as $i => $filter): ?>
<?
- $index = array_search($filter['field'], $collapsedFacets);
+ $index = isset($filter['field']) ? array_search($filter['field'], $collapsedFacets) : false;
if ($index !== false) {
unset($collapsedFacets[$index]); // Open if we have a match
}
diff --git a/themes/bootstrap/templates/Recommend/CollectionSideFacets.phtml b/themes/bootstrap/templates/Recommend/CollectionSideFacets.phtml
index dedc1dba44f..93ac3d8487a 100644
--- a/themes/bootstrap/templates/Recommend/CollectionSideFacets.phtml
+++ b/themes/bootstrap/templates/Recommend/CollectionSideFacets.phtml
@@ -10,7 +10,8 @@
array(
'value' => $keywordFilter,
'displayText' => $keywordFilter,
- 'specialType' => 'keyword'
+ 'specialType' => 'keyword',
+ 'operator' => 'OR'
)
)
);
diff --git a/themes/bootstrap/templates/Recommend/SideFacets.phtml b/themes/bootstrap/templates/Recommend/SideFacets.phtml
index 876453cd841..2430a5f110f 100644
--- a/themes/bootstrap/templates/Recommend/SideFacets.phtml
+++ b/themes/bootstrap/templates/Recommend/SideFacets.phtml
@@ -22,7 +22,7 @@
<? foreach ($filterList as $field => $filters): ?>
<? foreach ($filters as $i => $filter): ?>
<?
- $index = array_search($filter['field'], $collapsedFacets);
+ $index = isset($filter['field']) ? array_search($filter['field'], $collapsedFacets) : false;
if ($index !== false) {
unset($collapsedFacets[$index]); // Open if we have a match
}
--
GitLab