From 03ddb24be048af2d72e3e8c8c110cbd5c3bad1ae Mon Sep 17 00:00:00 2001
From: Dorian Merz <merz@ub.uni-leipzig.de>
Date: Thu, 16 May 2019 11:22:51 +0200
Subject: [PATCH] refs #14758 [fid_bbi] VuFind5 adoption
* corrected some ViewHelper calls
---
themes/fid_bbi/templates/layout/layout.phtml | 9 +++++----
themes/fid_bbi/templates/search/searchbox.phtml | 8 ++++----
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/themes/fid_bbi/templates/layout/layout.phtml b/themes/fid_bbi/templates/layout/layout.phtml
index ec798a4452e..258c5c8e9a3 100644
--- a/themes/fid_bbi/templates/layout/layout.phtml
+++ b/themes/fid_bbi/templates/layout/layout.phtml
@@ -107,11 +107,12 @@
}
// Session keep-alive
- if ($this->KeepAlive()) {
- $this->headScript()->appendScript('var keepAliveInterval = '
- . $this->KeepAlive());
- $this->headScript()->appendFile("keep_alive.js");
+ if ($this->keepAlive()) {
+ $this->headScript()->appendScript('var keepAliveInterval = '
+ . $this->keepAlive());
+ $this->headScript()->appendFile("keep_alive.js");
}
+
?>
<?
$root = rtrim($this->url('home'), '/');
diff --git a/themes/fid_bbi/templates/search/searchbox.phtml b/themes/fid_bbi/templates/search/searchbox.phtml
index 995f4354d20..7dede105bbc 100644
--- a/themes/fid_bbi/templates/search/searchbox.phtml
+++ b/themes/fid_bbi/templates/search/searchbox.phtml
@@ -19,16 +19,16 @@ $lastSort = $this->searchMemory()->getLastSort($this->searchClassId);
$lastLimit = $this->searchMemory()->getLastLimit($this->searchClassId);
$ignoreHiddenFilterMemory = isset($this->ignoreHiddenFilterMemory) && $this->ignoreHiddenFilterMemory;
$ignoreHiddenFiltersInRequest = isset($this->ignoreHiddenFiltersInRequest) && $this->ignoreHiddenFiltersInRequest;
-$hiddenFilters = $this->searchtabs()->getHiddenFilters($this->searchClassId, $ignoreHiddenFilterMemory, $ignoreHiddenFiltersInRequest);
+$hiddenFilters = $this->searchTabs()->getHiddenFilters($this->searchClassId, $ignoreHiddenFilterMemory, $ignoreHiddenFiltersInRequest);
if (empty($hiddenFilters) && !$ignoreHiddenFilterMemory) {
$hiddenFilters = $this->searchMemory()->getLastHiddenFilters($this->searchClassId);
if (empty($hiddenFilters)) {
- $hiddenFilters = $this->searchtabs()->getHiddenFilters($this->searchClassId);
+ $hiddenFilters = $this->searchTabs()->getHiddenFilters($this->searchClassId);
}
}
-$hiddenFilterParams = $this->searchtabs()->getCurrentHiddenFilterParams($this->searchClassId, $ignoreHiddenFilterMemory, '?');
+$hiddenFilterParams = $this->searchTabs()->getCurrentHiddenFilterParams($this->searchClassId, $ignoreHiddenFilterMemory, '?');
?>
-<? $searchTabs = $this->searchtabs()->getTabConfig($this->searchClassId, $this->lookfor, $this->searchIndex, $this->searchType, $hiddenFilters); ?>
+<? $searchTabs = $this->searchTabs()->getTabConfig($this->searchClassId, $this->lookfor, $this->searchIndex, $this->searchType, $hiddenFilters); ?>
<? if ($this->searchType == 'advanced'): ?>
<? /* finc: keep .no-margin-t or advanced search box will be pushed down too far (navbar-form) */ ?>
<div class="navbar-left flip no-margin-t">
--
GitLab