From d61d4236ad4bb1c6988f395e686e735c28636d95 Mon Sep 17 00:00:00 2001 From: Julian Maurice Date: Mon, 12 Jun 2017 09:18:30 +0200 Subject: [PATCH] Bug 18633: Remove remaining use of CGI.param in template [16.11.x] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marc VĂ©ron Signed-off-by: Marcel de Rooy --- catalogue/itemsearch.pl | 3 +++ koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch_json.tt | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/catalogue/itemsearch.pl b/catalogue/itemsearch.pl index fa6b357..12ef3b4 100755 --- a/catalogue/itemsearch.pl +++ b/catalogue/itemsearch.pl @@ -243,6 +243,9 @@ if (scalar keys %params > 0) { my $pagination_bar = pagination_bar($url, $nb_pages, $current_page, 'page'); $template->param(pagination_bar => $pagination_bar); + } elsif ($format eq 'json') { + $template->param(sEcho => scalar $cgi->param('sEcho')); + output_with_http_headers $cgi, $cookie, $template->output, 'json'; } } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch_json.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch_json.tt index 35e020f..4bc2add 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch_json.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch_json.tt @@ -1,6 +1,5 @@ -[%- USE CGI -%] { - "sEcho": [% CGI.param('sEcho') %], + "sEcho": [% sEcho %], "iTotalRecords": [% total_rows %], "iTotalDisplayRecords": [% total_rows %], "aaData": [ -- 2.1.4