Bugzilla – Attachment 92622 Details for
Bug 16111
RSS feed for OPAC search results has wrong content type
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 16111: (QA follow-up) Changes related to partial revert
Bug-16111-QA-follow-up-Changes-related-to-partial-.patch (text/plain), 3.51 KB, created by
Marcel de Rooy
on 2019-09-06 09:57:59 UTC
(
hide
)
Description:
Bug 16111: (QA follow-up) Changes related to partial revert
Filename:
MIME Type:
Creator:
Marcel de Rooy
Created:
2019-09-06 09:57:59 UTC
Size:
3.51 KB
patch
obsolete
>From 3285914f861a3eaf80f74e1aa73b31903bc4a4b6 Mon Sep 17 00:00:00 2001 >From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >Date: Fri, 6 Sep 2019 09:02:38 +0000 >Subject: [PATCH] Bug 16111: (QA follow-up) Changes related to partial revert >Content-Type: text/plain; charset=utf-8 > >When reverting the & change, we need to go back to html filter for >query_cgi and limit_cgi. In this patch I only replaced it where it is >needed. The template contains more references to SEARCH_RESULT.query_cgi >and SEARCH_RESULT.limit_cgi which are useless, since searchResults does >not return these hash keys at all. > >This patch fixes one occurrence where SEARCH_RESULT was copied outside >the loop that defines the template variable. > >Obviously, the code for RSS still needs more attention. > >Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >--- > koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt | 8 ++++---- > 1 file changed, 4 insertions(+), 4 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 bc26e9db5d..d25c3747b5 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt >@@ -23,8 +23,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 | $raw %][% limit_cgi | $raw %]&format=rss</link> >- <atom:link rel="self" type="application/rss+xml" href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-search.pl?[% SEARCH_RESULT.query_cgi | $raw %][% SEARCH_RESULT.limit_cgi | $raw %]&sort_by=[% sort_by | uri %]&format=atom"/> >+ <link>[% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?[% query_cgi | html %][% limit_cgi | html %]&format=rss</link> >+ <atom:link rel="self" type="application/rss+xml" href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-search.pl?[% query_cgi | html %][% limit_cgi | html %]&sort_by=[% sort_by | uri %]&format=atom"/> > <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> >@@ -81,9 +81,9 @@ > [% IF ( atom ) %] > <feed xmlns="http://www.w3.org/2005/Atom" > xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/"> >- <id>[% OPACBaseURL | url %]/cgi-bin/koha/opac-search.pl?[% query_cgi | $raw %][% limit_cgi | $raw %]&format=atom</id> >+ <id>[% OPACBaseURL | url %]/cgi-bin/koha/opac-search.pl?[% query_cgi | html %][% limit_cgi | html %]&format=atom</id> > <title>[% LibraryName | html %] Search [% IF ( query_desc ) %]for '[% query_desc | html %]'[% END %][% IF ( limit_desc ) %] with limit(s): '[% limit_desc | html %]'[% END %]</title> >- <link href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-search.pl?[% query_cgi | $raw %][% limit_cgi | $raw %]&format=rss2"/> >+ <link href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-search.pl?[% query_cgi | html %][% limit_cgi | html %]&format=rss2"/> > <updated>[% timestamp | html %]</updated> > <author> > <name>[% LibraryName | html %]</name> >-- >2.11.0
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 16111
:
49400
|
49587
|
49629
|
49837
|
76148
|
76160
|
76161
|
76162
|
77057
|
77058
|
77059
|
77060
|
78578
|
78579
|
78580
|
78581
|
78689
|
81285
|
81286
|
81287
|
81288
|
92050
|
92362
|
92363
|
92366
|
92435
|
92436
|
92437
|
92438
|
92439
|
92618
|
92619
|
92620
|
92621
| 92622 |
92623
|
92624