From da97436614ce8b1ddb9aa2e7f1861d1e82deea84 Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Fri, 1 May 2020 20:11:29 +0000 Subject: [PATCH] Bug 11994: (follow-up) Make things work when LibraryName is empty When LibraryName system preference was not set, the installation of the plugin would fail with: Firefox could not download the search plugin from: ... Now if the pref is empty, the description 'Library catalog' will be used instead. To test: - Empty your LibraryName pref - Verify the search plugin can still be installed (see first patch for further instructions) Signed-off-by: David Nind Signed-off-by: Martin Renvoize Signed-off-by: Jonathan Druart (cherry picked from commit 1e0dd6d0783a66514fc92cc0a34ca0882a5ce62f) Signed-off-by: Lucas Gass (cherry picked from commit 42e8c0185cf50b93789f3cfe6d4532565e084aeb) Signed-off-by: Aleisha Amohia --- .../bootstrap/en/modules/opac-opensearch.tt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt index 7b43110ddc..43d205ecbe 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt @@ -1,12 +1,12 @@ - -[% USE raw %] -[% USE Koha %] -[% SET AdlibrisEnabled = Koha.Preference('AdlibrisCoversEnabled') %] -[% SET AdlibrisURL = Koha.Preference('AdlibrisCoversURL') %] + +[%- USE raw -%] +[%- USE Koha -%] +[%- SET AdlibrisEnabled = Koha.Preference('AdlibrisCoversEnabled') -%] +[%- SET AdlibrisURL = Koha.Preference('AdlibrisCoversURL') -%] [% IF ( opensearchdescription ) %] - [% LibraryNameTitle | html %] + [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Library catalog[% END %] Search the [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha library[% END %] catalog UTF-8 -- 2.39.5