Attachment 81764 Details for Bug 21526 – Bug 21526: Fix search result pages (url vs uri vs raw)

[patch] Bug 21526: Fix search result pages (url vs uri vs raw)

Bug-21526-Fix-search-result-pages-url-vs-uri-vs-ra.patch (text/plain), 21.64 KB, created by Jonathan Druart on 2018-10-31 17:37:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2018-10-31 17:37:11 UTC

Size: 21.64 KB

patch

obsolete

>From 8684c54e03d07e094315eb955b0d02d67ec52bb6 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Wed, 31 Oct 2018 13:48:47 -0300
>Subject: [PATCH] Bug 21526: Fix search result pages (url vs uri vs raw)
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>query_cgi is uri_escaped from the pl, so we should displayed as raw
>
>Test plan:
>Use wide characters â¤
>Search, filter, facets, search history, rss (both interfaces)
>
>Please test deeply!
>---
> .../intranet-tmpl/prog/en/includes/facets.inc      | 13 ++++++------
> .../prog/en/modules/catalogue/results.tt           |  2 +-
> .../prog/en/modules/catalogue/search-history.tt    |  8 ++++----
> .../bootstrap/en/includes/opac-facets.inc          | 12 +++++------
> .../opac-tmpl/bootstrap/en/modules/opac-detail.tt  |  2 +-
> .../bootstrap/en/modules/opac-opensearch.tt        | 23 +++++++++++-----------
> .../bootstrap/en/modules/opac-results-grouped.tt   |  3 +--
> .../opac-tmpl/bootstrap/en/modules/opac-results.tt |  4 ++--
> 8 files changed, 34 insertions(+), 33 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc
>index 204d11a366..4d2e34d1dc 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc
>@@ -1,3 +1,4 @@
>+[% USE raw %]
> [% USE AuthorisedValues %]
> [% IF ( opacfacets ) %]
> [% IF ( facets_loop ) %]
>@@ -25,18 +26,18 @@
> <ul>
>   [% SET url = "/cgi-bin/koha/catalogue/search.pl?" _ query_cgi _ limit_cgi %]
>   [% IF ( sort_by ) %]
>-    [% url = BLOCK %][% url | html %][% "&amp;sort_by=" _ sort_by |url %][% END %]
>+    [% url = BLOCK %][% url | $raw %][% "&sort_by=" _ sort_by | url %][% END %]
>   [% END %]
>   [% FOREACH facet IN facets_loo.facets %]
>   [% IF facets_loo.type_label_CollectionCodes %][% SET facet.facet_label_value = AuthorisedValues.GetByCode('CCODE',facet.facet_label_value,0) || facet.facet_label_value %][% END %]
>     <li>
>       [% IF facet.active %]
>-        [% SET local_url = url _ "&amp;nolimit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %]
>+        [% local_url = BLOCK %][% url | $raw %][% "&nolimit=" _  facet.type_link_value _ ":" _ facet.facet_link_value | url %][% END %]
>         <span class="facet-label">[% facet.facet_label_value | html %]</span>
>-        [<a href="[% local_url | url %]" title="Remove facet [% facet.facet_link_value | html %]">x</a>]
>+        [<a href="[% local_url | $raw %]" title="Remove facet [% facet.facet_link_value | html %]">x</a>]
>       [% ELSE %]
>-        [% SET local_url = url _ "&amp;limit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %]
>-        <span class="facet-label"><a href="[% local_url | url %]" title="[% facet.facet_title_value | html %]">[% facet.facet_label_value | html %]</a></span>
>+        [% local_url = BLOCK %][% url | $raw %][% "&limit=" _  facet.type_link_value _ ":" _ facet.facet_link_value | url %][% END %]
>+        <span class="facet-label"><a href="[% local_url | $raw %]" title="[% facet.facet_title_value | html %]">[% facet.facet_label_value | html %]</a></span>
>         [% IF ( displayFacetCount ) %]
>           <span class="facet-count"> ([% facet.facet_count | html %])</span>
>         [% END %]
>@@ -45,7 +46,7 @@
>   [% END %]
>   [% IF ( facets_loo.expandable ) %]
>       <li class="showmore">
>-          <a href="[% url | url %][% IF offset %]&amp;offset=[% offset |url %][% END %]&amp;expand=[% facets_loo.expand |url %]#[% facets_loo.type_id |url %]">Show more</a>
>+          <a href="[% url | url %][% IF offset %]&amp;offset=[% offset | uri %][% END %]&amp;expand=[% facets_loo.expand | uri %]#[% facets_loo.type_id | uri %]">Show more</a>
>       </li>
>   [% END %]
> </ul></li>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
>index 4c5933dc94..8a59cd7c71 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
>@@ -594,7 +594,7 @@
>     [% IF ( outer_sup_results_loo.inner_sup_results_loop ) %]
>         [% outer_sup_results_loo.servername | html %]
>         [% FOREACH inner_sup_results_loo IN outer_sup_results_loo.inner_sup_results_loop %]
>-        <div><a href="/cgi-bin/koha/catalogue/search.pl?[% inner_sup_results_loo.query_cgi | uri %][% inner_sup_results_loo.limit_cgi | uri %][% inner_sup_results_loo.sort_by | uri %][% inner_sup_results_loo.link | uri %]">[% inner_sup_results_loo.title | html %]</a></div>
>+        <div><a href="/cgi-bin/koha/catalogue/search.pl?[% inner_sup_results_loo.query_cgi | $raw %][% inner_sup_results_loo.limit_cgi | uri %][% inner_sup_results_loo.sort_by | uri %][% inner_sup_results_loo.link | uri %]">[% inner_sup_results_loo.title | html %]</a></div>
>         [% END %]
>     [% END %]
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt
>index 34111a2042..8d8688cbaa 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt
>@@ -57,7 +57,7 @@
>                   <tr>
>                     <td><input type="checkbox" name="id" value="[% s.id | html %]" /></td>
>                     <td><span title="[% s.time | html %]">[% s.time |$KohaDates with_hours => 1 | html %]</span></td>
>-                    <td><a href="/cgi-bin/koha/catalogue/search.pl?[% s.query_cgi | uri %]">[% s.query_desc | html %]</a></td>
>+                    <td><a href="/cgi-bin/koha/catalogue/search.pl?[% s.query_cgi | url %]">[% s.query_desc | html %]</a></td>
>                     <td>[% s.total | html %]</td>
>                   </tr>
>                 [% END %]
>@@ -94,7 +94,7 @@
>                   <tr>
>                     <td><input type="checkbox" name="id" value="[% s.id | html %]" /></td>
>                     <td><span title="[% s.time | html %]">[% s.time |$KohaDates with_hours => 1 | html %]</span></td>
>-                    <td><a href="/cgi-bin/koha/catalogue/search.pl?[% s.query_cgi | uri %]">[% s.query_desc | html %]</a></td>
>+                    <td><a href="/cgi-bin/koha/catalogue/search.pl?[% s.query_cgi | url %]">[% s.query_desc | html %]</a></td>
>                     <td>[% s.total | html %]</td>
>                   </tr>
>                 [% END %]
>@@ -137,7 +137,7 @@
>                   <tr>
>                     <td><input type="checkbox" name="id" value="[% s.id | html %]" /></td>
>                     <td><span title="[% s.time | html %]">[% s.time |$KohaDates with_hours => 1 | html %]</span></td>
>-                    <td><a href="/cgi-bin/koha/authorities/authorities-home.pl?[% s.query_cgi | uri %]">[% s.query_desc | html %]</a></td>
>+                    <td><a href="/cgi-bin/koha/authorities/authorities-home.pl?[% s.query_cgi | url %]">[% s.query_desc | html %]</a></td>
>                     <td>[% s.total | html %]</td>
>                   </tr>
>                 [% END %]
>@@ -174,7 +174,7 @@
>                   <tr>
>                     <td><input type="checkbox" name="id" value="[% s.id | html %]" /></td>
>                     <td><span title="[% s.time | html %]">[% s.time |$KohaDates with_hours => 1 | html %]</span></td>
>-                    <td><a href="/cgi-bin/koha/authorities/authorities-home.pl?[% s.query_cgi | uri %]">[% s.query_desc | html %]</a></td>
>+                    <td><a href="/cgi-bin/koha/authorities/authorities-home.pl?[% s.query_cgi | url %]">[% s.query_desc | html %]</a></td>
>                     <td>[% s.total | html %]</td>
>                   </tr>
>                 [% END %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc
>index e770bb7e16..6102b54474 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc
>@@ -35,18 +35,18 @@
>                         <ul>
>                             [% SET url = "/cgi-bin/koha/opac-search.pl?" _ query_cgi _ limit_cgi %]
>                             [% IF ( sort_by ) %]
>-                              [% url = BLOCK %][% url | html %][% "&amp;sort_by=" _ sort_by |url %][% END %]
>+                              [% url = BLOCK %][% url | $raw %][% "&amp;sort_by=" _ sort_by | url %][% END %]
>                             [% END %]
>                             [% FOREACH facet IN facets_loo.facets %]
>                             [% IF facets_loo.type_label_CollectionCodes %][% SET facet.facet_label_value = AuthorisedValues.GetByCode('CCODE',facet.facet_label_value,1) || facet.facet_label_value %][% END %]
>                                 <li>
>                                   [% IF facet.active %]
>-                                    [% SET local_url = url _ "&amp;nolimit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %]
>+                                    [% local_url = BLOCK %][% url | $raw %][% "&nolimit=" _  facet.type_link_value _ ":" _ facet.facet_link_value | url %][% END %]
>                                     <span class="facet-label">[% facet.facet_label_value | html %]</span>
>-                                    [<a href="[% local_url | url %]" title="Remove facet [% facet.facet_link_value | html %]">x</a>]
>+                                    [<a href="[% local_url | $raw %]" title="Remove facet [% facet.facet_link_value | html %]">x</a>]
>                                   [% ELSE %]
>-                                    [% SET local_url = url _ "&amp;limit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %]
>-                                    <span class="facet-label"><a href="[% local_url | url %]" title="[% facet.facet_title_value | html %]">[% facet.facet_label_value | html %]</a></span>
>+                                    [% local_url = BLOCK %][% url | $raw %][% "&limit=" _  facet.type_link_value _ ":" _ facet.facet_link_value | url %][% END %]
>+                                    <span class="facet-label"><a href="[% local_url | $raw %]" title="[% facet.facet_title_value | html %]">[% facet.facet_label_value | html %]</a></span>
>                                     [% IF ( displayFacetCount ) %]
>                                       <span class="facet-count"> ([% facet.facet_count | html %])</span>
>                                     [% END %]
>@@ -55,7 +55,7 @@
>                             [% END %]
>                             [% IF ( facets_loo.expandable ) %]
>                                 <li class="showmore">
>-                                    <a href="[% url | url %][% IF offset %]&amp;offset=[% offset |uri %][% END %]&amp;expand=[% facets_loo.expand |uri %]#[% facets_loo.type_id |uri %]">Show more</a>
>+                                    <a href="[% url | $raw %][% IF offset %]&amp;offset=[% offset | uri %][% END %]&amp;expand=[% facets_loo.expand | uri %]#[% facets_loo.type_id | uri %]">Show more</a>
>                                 </li>
>                             [% END %]
>                         </ul>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
>index f557c418be..ac4263136a 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
>@@ -1081,7 +1081,7 @@
>                                 [% END %]
>                             </li>
>                             [%# busc is already URI encoded %]
>-                            <li class="back_results"><a href="opac-search.pl?[% busc | uri %]" title="Back to the results search list">Back to results</a></li>
>+                            <li class="back_results"><a href="opac-search.pl?[% busc | $raw %]" title="Back to the results search list">Back to results</a></li>
>                             <li class="right_results">
>                                 [% IF ( nextBiblionumber ) %]
>                                     <a href="opac-detail.pl?biblionumber=[% nextBiblionumber | uri %][% IF ( query_desc && OpacHighlightedWords ) %]&query_desc=[% query_desc |uri %][% END %]" title="See: [% IF ( nextTitle ) %][% nextTitle | html %][% ELSE %]next biblio[% END %]">Next <i class="fa fa-angle-double-right"></i></a>
>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 b1611b94f6..d3b62bb278 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt
>@@ -1,4 +1,5 @@
> <?xml version='1.0' encoding='utf-8'  ?>
>+[% USE raw %]
> [% USE Koha %]
> [% IF ( opensearchdescription ) %]
> <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
>@@ -19,8 +20,8 @@
>       xmlns:atom="http://www.w3.org/2005/Atom">
>    <channel>
>      <title><![CDATA[[% LibraryName | html %] Search [% IF ( query_desc ) %]for '[% query_desc | html %]'[% END %][% IF ( limit_desc ) %] with limit(s): '[% limit_desc | html %]'[% END %]]]></title>
>-     <link>[% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?[% query_cgi | html %][% limit_cgi | html %]&amp;format=rss2</link>
>-     <atom:link rel="self" type="application/rss+xml" href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-search.pl?[% query_cgi |uri %][% limit_cgi |uri %]&amp;sort_by=[% sort_by | uri %]&amp;format=rss2"/>
>+     <link>[% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?[% query_cgi | $raw %][% limit_cgi | url %]&amp;format=rss2</link>
>+     <atom:link rel="self" type="application/rss+xml" href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-search.pl?[% query_cgi | $raw %][% limit_cgi | url %]&amp;sort_by=[% sort_by | uri %]&amp;format=rss2"/>
>      <description><![CDATA[ Search results [% IF ( query_desc ) %]for '[% query_desc | html %]'[% END %][% IF ( limit_desc ) %] with limit(s): '[% limit_desc | html %]'[% END %] at [% LibraryName | html %]]]></description>
>      <opensearch:totalResults>[% total | html %]</opensearch:totalResults>
>      <opensearch:startIndex>[% offset | html %]</opensearch:startIndex>
>@@ -30,7 +31,7 @@
>        <opensearch:itemsPerPage>20</opensearch:itemsPerPage>
>      [% END %]
> 	 [% FOREACH SEARCH_RESULT IN SEARCH_RESULTS %]
>-     <atom:link rel="search" type="application/opensearchdescription+xml" href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-search.pl?[% SEARCH_RESULT.query_cgi |uri %][% SEARCH_RESULT.limit_cgi |uri %]&amp;sort_by=[% SEARCH_RESULT.sort_by |uri %]&amp;format=opensearchdescription"/>
>+     <atom:link rel="search" type="application/opensearchdescription+xml" href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-search.pl?[% SEARCH_RESULT.query_cgi | $raw %][% SEARCH_RESULT.limit_cgi | url %]&amp;sort_by=[% SEARCH_RESULT.sort_by |uri %]&amp;format=opensearchdescription"/>
>      <opensearch:Query role="request" searchTerms="[% SEARCH_RESULT.query_desc |uri %][% SEARCH_RESULT.limit_desc |uri %]" startPage="[% SEARCH_RESULT.page | html %]" />
>      <item>
>        <title>[% SEARCH_RESULT.title | html %] [% FOREACH subtitl IN SEARCH_RESULT.subtitle %], [% subtitl.subfield | html %][% END %]</title>
>@@ -67,9 +68,9 @@
> [% IF ( atom ) %]
> <feed xmlns="http://www.w3.org/2005/Atom"
>        xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/">
>-   <id>[% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?[% query_cgi | html %][% limit_cgi | html %]&amp;format=atom</id>
>+   <id>[% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?[% query_cgi | $raw %][% limit_cgi | html %]&amp;format=atom</id>
>    <title>[% LibraryName | html %] Search [% IF ( query_desc ) %]for '[% query_desc | html %]'[% END %][% IF ( limit_desc ) %]&nbsp;with limit(s):&nbsp;'[% limit_desc | html %]'[% END %]</title>
>-    <link href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-search.pl?[% query_cgi |uri %][% limit_cgi |uri %]&amp;format=rss2"/>
>+    <link href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-search.pl?[% query_cgi | $raw %][% limit_cgi | url %]&amp;format=rss2"/>
>    <updated>[% timestamp | html %]</updated>
>    <author>
>      <name>[% LibraryName | html %]</name>
>@@ -83,12 +84,12 @@
>      <opensearch:itemsPerPage>20</opensearch:itemsPerPage>
>    [% END %]
>    <opensearch:Query role="request" searchTerms="[% query_desc | html %] [% limit_desc | html %]" startPage="[% page | html %]" />
>-   <link rel="alternate" href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-search.pl?[% query_cgi | uri %][% limit_cgi | uri %]pw=[% page | uri %]&amp;format=atom" type="application/atom+xml"/>
>-   <link rel="self" href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-search.pl?[% query_cgi | uri %][% limit_cgi | uri %]&amp;format=atom" type="application/atom+xml"/>
>-   <link rel="first" href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-search.pl?[% query_cgi | uri %][% limit_cgi | uri %]pw=1&amp;format=atom" type="application/atom+xml"/>
>-   <link rel="previous" href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-search.pl?[% query_cgi | uri %][% limit_cgi | uri %]pw=2&amp;format=atom" type="application/atom+xml"/>
>-   <link rel="next" href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-search.pl?[% query_cgi | uri %][% limit_cgi | uri %]pw=4&amp;format=atom" type="application/atom+xml"/>
>-   <link rel="last" href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-search.pl?[% query_cgi | uri %][% limit_cgi | uri %]pw=42299&amp;format=atom" type="application/atom+xml"/>
>+   <link rel="alternate" href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-search.pl?[% query_cgi | $raw %][% limit_cgi | url %]pw=[% page | uri %]&amp;format=atom" type="application/atom+xml"/>
>+   <link rel="self" href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-search.pl?[% query_cgi | $raw %][% limit_cgi | url %]&amp;format=atom" type="application/atom+xml"/>
>+   <link rel="first" href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-search.pl?[% query_cgi | $raw %][% limit_cgi | url %]pw=1&amp;format=atom" type="application/atom+xml"/>
>+   <link rel="previous" href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-search.pl?[% query_cgi | $raw %][% limit_cgi | url %]pw=2&amp;format=atom" type="application/atom+xml"/>
>+   <link rel="next" href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-search.pl?[% query_cgi | $raw %][% limit_cgi | url %]pw=4&amp;format=atom" type="application/atom+xml"/>
>+   <link rel="last" href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-search.pl?[% query_cgi | $raw %][% limit_cgi | url %]pw=42299&amp;format=atom" type="application/atom+xml"/>
>    <link rel="search" type="application/opensearchdescription+xml" href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-search.pl?format=opensearchdescription"/>
> 
>    [% FOREACH SEARCH_RESULT IN SEARCH_RESULTS %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results-grouped.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results-grouped.tt
>index 25c5bb557e..f1ce89f460 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results-grouped.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results-grouped.tt
>@@ -10,8 +10,7 @@
> [% END %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
> [% BLOCK cssinclude %][% END %]
>-<link rel="alternate" type="application/rss+xml" title="Koha - RSS"
>-href="/cgi-bin/koha/opac-rss.pl?[% query_cgi | html %][% limit_cgi | html %]" />
>+<link rel="alternate" type="application/rss+xml" title="Koha - RSS" href="/cgi-bin/koha/opac-rss.pl?[% query_cgi | $raw %][% limit_cgi | url %]" />
> 
> </head>
> [% INCLUDE 'bodytag.inc' bodyid='results-grouped' %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
>index aaf60fbc92..79a04509c8 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
>@@ -43,7 +43,7 @@
>                         <strong>No results found!</strong>
>                         <p>
>                             [% IF ( searchdesc ) %]
>-                                No results found for that in [% LibraryName | html %] catalog. <a href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-search.pl?[% query_cgi | url %][% limit_cgi | url %]&amp;format=rss2" class="rsssearchlink noprint"><img src="[% interface | html %]/[% theme | html %]/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" border="0" class="rsssearchicon"/></a>
>+                                No results found for that in [% LibraryName | html %] catalog. <a href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-search.pl?[% query_cgi | $raw %][% limit_cgi | url %]&amp;format=rss2" class="rsssearchlink noprint"><img src="[% interface | html %]/[% theme | html %]/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" border="0" class="rsssearchicon"/></a>
>                             [% ELSE %]
>                                 You did not specify any search criteria.
>                             [% END %]
>@@ -87,7 +87,7 @@
>                                 [% END %]
>                             ).
>                         [% END %]
>-                        <a href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-search.pl?[% query_cgi | url %][% limit_cgi | url %]&amp;count=[% countrss | uri %]&amp;sort_by=acqdate_dsc&amp;format=rss2" class="rsssearchlink noprint"><img src="[% interface | html %]/[% theme | html %]/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" class="rsssearchicon"/></a>
>+                        <a href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-search.pl?[% query_cgi | $raw %][% limit_cgi | url %]&amp;count=[% countrss | uri %]&amp;sort_by=acqdate_dsc&amp;format=rss2" class="rsssearchlink noprint"><img src="[% interface | html %]/[% theme | html %]/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" class="rsssearchicon"/></a>
>                     [% END # / IF total %]
>                     </p>
>                 [% END # / IF searchdesc %]
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 21526: 80337 | 80641 | 80649 | 80661 | 80725 | 80755 | 80756 | 81058 | 81059 | 81300 | 81301 | 81302 | 81337 | 81530 | 81763 | 81764 | 82011 | 82012 | 82013 | 82140 | 82141 | 82142 | 82600