Attachment 81530 Details for Bug 21526 – Bug 21526: Use the 'url' filter when needed

[patch] Bug 21526: Use the 'url' filter when needed

Bug-21526-Use-the-url-filter-when-needed.patch (text/plain), 108.61 KB, created by Jonathan Druart on 2018-10-29 19:16:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2018-10-29 19:16:44 UTC

Size: 108.61 KB

patch

obsolete

>From 0147ae70c0ea1bd490e818f7eac66cac0e57d2c4 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Mon, 29 Oct 2018 16:16:17 -0300
>Subject: [PATCH] Bug 21526: Use the 'url' filter when needed
>
>---
> .../en/includes/authorities-search-results.inc     |  4 ++--
> .../intranet-tmpl/prog/en/includes/facets.inc      |  6 +++---
> .../prog/en/modules/acqui/addorderiso2709.tt       |  2 +-
> .../intranet-tmpl/prog/en/modules/acqui/basket.tt  |  2 +-
> .../prog/en/modules/acqui/basketgroup.tt           |  8 ++++----
> .../prog/en/modules/acqui/cancelorder.tt           |  2 +-
> .../prog/en/modules/acqui/modordernotes.tt         |  2 +-
> .../prog/en/modules/acqui/supplier.tt              |  2 +-
> .../prog/en/modules/acqui/uncertainprice.tt        |  2 +-
> .../prog/en/modules/admin/aqbudgetperiods.tt       |  8 ++++----
> .../prog/en/modules/admin/aqcontract.tt            |  6 +++---
> .../en/modules/admin/auth_subfields_structure.tt   |  2 +-
> .../prog/en/modules/admin/auth_tag_structure.tt    |  6 +++---
> .../prog/en/modules/admin/branches.tt              |  2 +-
> .../prog/en/modules/admin/classsources.tt          | 12 +++++------
> .../prog/en/modules/admin/marctagstructure.tt      |  2 +-
> .../prog/en/modules/admin/matching-rules.tt        |  6 +++---
> .../prog/en/modules/admin/patron-attr-types.tt     |  6 +++---
> .../prog/en/modules/admin/printers.tt              |  2 +-
> .../prog/en/modules/admin/systempreferences.tt     |  6 +++---
> .../prog/en/modules/admin/usage_statistics.tt      |  2 +-
> koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt    |  8 ++++----
> .../intranet-tmpl/prog/en/modules/basket/basket.tt |  6 +++---
> .../prog/en/modules/batch/print-notices.tt         |  2 +-
> .../prog/en/modules/catalogue/MARCdetail.tt        |  2 +-
> .../prog/en/modules/catalogue/detail.tt            | 10 ++++-----
> .../prog/en/modules/catalogue/results.tt           |  2 +-
> .../prog/en/modules/cataloguing/additem.tt         |  2 +-
> .../prog/en/modules/circ/printslip.tt              |  2 +-
> .../prog/en/modules/circ/waitingreserves.tt        |  2 +-
> .../en/modules/course_reserves/course-details.tt   |  4 ++--
> .../prog/en/modules/ill/ill-requests.tt            |  8 ++++----
> .../en/modules/reports/guided_reports_start.tt     |  2 +-
> .../en/modules/serials/subscription-batchedit.tt   |  2 +-
> .../prog/en/modules/serials/subscription-detail.tt |  2 +-
> .../prog/en/modules/suggestion/suggestion.tt       |  2 +-
> .../prog/en/modules/tools/batchMod-del.tt          |  6 +++---
> .../prog/en/modules/tools/batchMod-edit.tt         |  4 ++--
> .../prog/en/modules/tools/manage-marc-import.tt    | 10 ++++-----
> .../en/includes/authorities-search-results.inc     |  2 +-
> .../bootstrap/en/includes/doc-head-close.inc       |  6 +++---
> .../opac-tmpl/bootstrap/en/includes/masthead.inc   |  2 +-
> .../bootstrap/en/includes/opac-facets.inc          |  6 +++---
> .../bootstrap/en/modules/opac-auth-MARCdetail.tt   |  2 +-
> .../opac-tmpl/bootstrap/en/modules/opac-auth.tt    | 10 ++++-----
> .../opac-tmpl/bootstrap/en/modules/opac-basket.tt  |  6 +++---
> .../bootstrap/en/modules/opac-course-details.tt    |  4 ++--
> .../opac-tmpl/bootstrap/en/modules/opac-detail.tt  | 20 +++++++++---------
> .../opac-tmpl/bootstrap/en/modules/opac-main.tt    |  2 +-
> .../bootstrap/en/modules/opac-news-rss.tt          |  2 +-
> .../bootstrap/en/modules/opac-opensearch.tt        | 24 +++++++++++-----------
> .../opac-tmpl/bootstrap/en/modules/opac-results.tt |  8 ++++----
> .../bootstrap/en/modules/opac-search-history.tt    |  4 ++--
> .../opac-tmpl/bootstrap/en/modules/opac-shelves.tt |  2 +-
> .../bootstrap/en/modules/opac-showreviews-rss.tt   |  2 +-
> .../bootstrap/en/modules/opac-showreviews.tt       |  4 ++--
> .../opac-tmpl/bootstrap/en/modules/sci/sci-main.tt |  2 +-
> .../opac-tmpl/bootstrap/en/modules/sco/help.tt     |  2 +-
> .../bootstrap/en/modules/sco/printslip.tt          |  4 ++--
> .../opac-tmpl/bootstrap/en/modules/sco/sco-main.tt |  2 +-
> misc/cronjobs/rss/lastAcquired-1.0.tt              |  2 +-
> misc/cronjobs/rss/lastAcquired-2.0.tt              |  2 +-
> 62 files changed, 143 insertions(+), 143 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc
>index 06d66219df..3832d3c5ca 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc
>@@ -10,7 +10,7 @@
> 
>     [% IF marcflavour == 'UNIMARC' %]
>         [% IF authid %]
>-            [% link = BLOCK %]<a href="[% authidurl _ authid | $raw %]">[% heading | html %]</a>[% END %]
>+            [% link = BLOCK %]<a href="[% authidurl _ authid | url %]">[% heading | html %]</a>[% END %]
>         [% ELSE %]
>             [% link = BLOCK %][% heading | html %][% END %]
>         [% END %]
>@@ -28,7 +28,7 @@
>         <span class="heading">
>         [% IF ( linkType=='seealso' ) %]
>             [% IF ( authid ) %]
>-            <a href="[% authidurl | url %][% authid | url %]">[% heading | html %]</a>
>+            <a href="[% authidurl | url %][% authid | uri %]">[% heading | html %]</a>
>             [% ELSE %]
>             <a href="[% searchurl | url %][% heading | uri %]">[% heading | html %]</a>
>             [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc
>index b05084898a..204d11a366 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc
>@@ -33,10 +33,10 @@
>       [% IF facet.active %]
>         [% SET local_url = url _ "&amp;nolimit=" _ facet.type_link_value _ ":" _ facet.facet_link_value %]
>         <span class="facet-label">[% facet.facet_label_value | html %]</span>
>-        [<a href="[% local_url | uri %]" title="Remove facet [% facet.facet_link_value | html %]">x</a>]
>+        [<a href="[% local_url | url %]" 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 | uri %]" title="[% facet.facet_title_value | html %]">[% facet.facet_label_value | html %]</a></span>
>+        <span class="facet-label"><a href="[% local_url | url %]" 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 +45,7 @@
>   [% END %]
>   [% IF ( facets_loo.expandable ) %]
>       <li class="showmore">
>-          <a href="[% url | uri %][% 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 |url %][% END %]&amp;expand=[% facets_loo.expand |url %]#[% facets_loo.type_id |url %]">Show more</a>
>       </li>
>   [% END %]
> </ul></li>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
>index fe26aa8d12..02670a7a53 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
>@@ -413,7 +413,7 @@
>                         </td>
>                         <td><span title="[% batch_lis.staged_date | html %]">[% batch_lis.staged_date | $KohaDates with_hours => 1 | html %]</span></td>
>                         <td>[% batch_lis.num_records | html %]</td>
>-                        <td><a href="[% batch_lis.scriptname | uri %]?import_batch_id=[% batch_lis.import_batch_id | uri %]&amp;basketno=[% basketno | uri %]&amp;booksellerid=[% booksellerid | uri %]">Add orders</a></td>
>+                        <td><a href="[% batch_lis.scriptname | url %]?import_batch_id=[% batch_lis.import_batch_id | uri %]&amp;basketno=[% basketno | uri %]&amp;booksellerid=[% booksellerid | uri %]">Add orders</a></td>
>                       </tr>
>                       [% END %]
>                     </tbody>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
>index 49ee8c8391..5fcf68faee 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
>@@ -2,7 +2,7 @@
> [% USE Asset %]
> [% BLOCK csv_export %]
>     <div class="btn-group">
>-        <a id="exportbutton" class="btn btn-default btn-sm" href="[% script_name | html %]?op=export&amp;basketno=[% basketno | html %]&amp;booksellerid=[% booksellerid | html %]"><i class="fa fa-download"></i> Export as CSV</a>
>+        <a id="exportbutton" class="btn btn-default btn-sm" href="[% script_name | url %]?op=export&amp;basketno=[% basketno | html %]&amp;booksellerid=[% booksellerid | html %]"><i class="fa fa-download"></i> Export as CSV</a>
>       <a class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></a>
>       <ul class="dropdown-menu" id="export-csv-menu">
>           <li><a href="#">Default</a></li>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
>index 827d7aaf68..3be27fcedb 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
>@@ -144,11 +144,11 @@ function submitForm(form) {
>                 [% IF ( grouping ) %]
>                     [% IF (closedbg) %]
>                         <div id="toolbar" class="btn-toolbar">
>-                            <div class="btn-group"><a href="[% script_name | uri %]?op=reopen&amp;basketgroupid=[% basketgroupid | uri %]&amp;booksellerid=[% booksellerid | uri %]&amp;mode=singlebg" class="btn btn-default btn-sm" id="reopenbutton"><i class="fa fa-download"></i> Reopen this basket group</a></div>
>-                            <div class="btn-group"><a href="[% script_name | uri %]?op=export&amp;basketgroupid=[% basketgroupid | uri %]&amp;booksellerid=[% booksellerid | uri %]" class="btn btn-default btn-sm" id="exportbutton"><i class="fa fa-download"></i> Export this basket group as CSV</a></div>
>-                            <div class="btn-group"><a href="[% script_name | uri %]?op=print&amp;basketgroupid=[% basketgroupid | uri %]&amp;booksellerid=[% booksellerid | uri %]" class="btn btn-default btn-sm" id="printbutton"><i class="fa fa-download"></i> Print this basket group in PDF</a></div>
>+                            <div class="btn-group"><a href="[% script_name | url %]?op=reopen&amp;basketgroupid=[% basketgroupid | uri %]&amp;booksellerid=[% booksellerid | uri %]&amp;mode=singlebg" class="btn btn-default btn-sm" id="reopenbutton"><i class="fa fa-download"></i> Reopen this basket group</a></div>
>+                            <div class="btn-group"><a href="[% script_name | url %]?op=export&amp;basketgroupid=[% basketgroupid | uri %]&amp;booksellerid=[% booksellerid | uri %]" class="btn btn-default btn-sm" id="exportbutton"><i class="fa fa-download"></i> Export this basket group as CSV</a></div>
>+                            <div class="btn-group"><a href="[% script_name | url %]?op=print&amp;basketgroupid=[% basketgroupid | uri %]&amp;booksellerid=[% booksellerid | uri %]" class="btn btn-default btn-sm" id="printbutton"><i class="fa fa-download"></i> Print this basket group in PDF</a></div>
>                         [% IF (ediaccount) %]
>-                            <div class="btn-group"><a href="[% script_name | uri %]?op=ediprint&amp;basketgroupid=[% basketgroupid | uri %]&amp;booksellerid=[% booksellerid | uri %]" class="btn btn-default btn-sm" id="printbutton"><i class="fa fa-download"></i> Generate EDIFACT order</a></div>
>+                            <div class="btn-group"><a href="[% script_name | url %]?op=ediprint&amp;basketgroupid=[% basketgroupid | uri %]&amp;booksellerid=[% booksellerid | uri %]" class="btn btn-default btn-sm" id="printbutton"><i class="fa fa-download"></i> Generate EDIFACT order</a></div>
>                         [% END %]
>                         </div>
>                     [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt
>index 5af7d25d71..9023f7123f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt
>@@ -58,7 +58,7 @@
>                 <p>The order has been cancelled, although the record has not been deleted.</p>
>                 [% END %]
>         [% END %]
>-                <p><a href="[% referrer | uri %]">OK</a></p>
>+                <p><a href="[% referrer | url %]">OK</a></p>
>             </div>
>       [% END %]
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt
>index 4bb82debff..41b17a00e0 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt
>@@ -34,7 +34,7 @@
>         <input type="hidden" name="type" value="[% type | html %]" />
>         <fieldset class="action">
>           <input type="submit" value="Save" />
>-          <a class="cancel" href="[% referrer | html %]">Cancel</a>
>+          <a class="cancel" href="[% referrer | url %]">Cancel</a>
>         </fieldset>
>       </form>
>   </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
>index 7cc6bf1951..c6db1925fe 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
>@@ -264,7 +264,7 @@
>                 <p><span class="label">Phone: </span>[% phone | html %]</p>
>                 <p><span class="label">Fax: </span>[% fax | html %]</p>
>                 [% IF ( url ) %]
>-                    <p><span class="label">Website: </span><a href="[% url | uri %]">[% url | html %]</a></p>
>+                    <p><span class="label">Website: </span><a href="[% url | url %]">[% url | html %]</a></p>
>                 [% END %]
>                 [% IF ( accountnumber ) %]
>                     <p><span class="label">Account number: </span>[% accountnumber | html %]</p>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt
>index 425176e5e6..82c067ea97 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt
>@@ -33,7 +33,7 @@
>                 [% bookselleraddress2 | html %]
>                 [% bookselleraddress3 | html %]
>                 [% bookselleraddress4 | html %]
>-                <a href="[% booksellerurl | uri %]">[% booksellerurl | html %]</a>
>+                <a href="[% booksellerurl | url %]">[% booksellerurl | html %]</a>
>             </p>
>             <p><strong>Phone: </strong>
>                 [% booksellerphone | html %] / Fax:
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
>index 98a2e036ee..498486ccb2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
>@@ -10,7 +10,7 @@
>         </a>
>         <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="budgetmenu_[% block_budget.budget_period_id | html %]">
>               <li>
>-                  <a href="[% script_name | uri %]?op=add_form&amp;budget_period_id=[% block_budget.budget_period_id | uri %]"><i class="fa fa-pencil"></i> Edit</a>
>+                  <a href="[% script_name | url %]?op=add_form&amp;budget_period_id=[% block_budget.budget_period_id | uri %]"><i class="fa fa-pencil"></i> Edit</a>
>               </li>
>               [% IF block_budget.count %]
>                   <li class="disabled">
>@@ -18,14 +18,14 @@
>                   </li>
>               [% ELSE %]
>                   <li>
>-                      <a href="[% script_name | uri %]?op=delete_confirm&amp;budget_period_id=[% block_budget.budget_period_id | uri %]"><i class="fa fa-trash"></i> Delete</a>
>+                      <a href="[% script_name | url %]?op=delete_confirm&amp;budget_period_id=[% block_budget.budget_period_id | uri %]"><i class="fa fa-trash"></i> Delete</a>
>                   </li>
>               [% END %]
>               <li>
>-                  <a href="[% script_name | uri %]?op=duplicate_form&amp;budget_period_id=[% block_budget.budget_period_id | uri %]"><i class="fa fa-copy"></i> Duplicate</a>
>+                  <a href="[% script_name | url %]?op=duplicate_form&amp;budget_period_id=[% block_budget.budget_period_id | uri %]"><i class="fa fa-copy"></i> Duplicate</a>
>               </li>
>               <li>
>-                  <a href="[% script_name | uri %]?op=close_form&amp;budget_period_id=[% block_budget.budget_period_id | uri %]"><i class="fa fa-times-circle"></i> Close</a>
>+                  <a href="[% script_name | url %]?op=close_form&amp;budget_period_id=[% block_budget.budget_period_id | uri %]"><i class="fa fa-times-circle"></i> Close</a>
>               </li>
>               <li>
>                   <a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&amp;budget_period_id=[% block_budget.budget_period_id | uri %]"><i class="fa fa-plus"></i> Add fund</a>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt
>index 94f55d9e48..be66df0d45 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt
>@@ -151,14 +151,14 @@
>                     [% FOREACH loo IN loop %]
>                         <tr>
>                         <td>
>-                            <a href="[% loo.script_name | uri %]?op=add_form&amp;booksellerid=[% loo.booksellerid | uri %]&amp;contractnumber=[% loo.contractnumber | uri %]">[% loo.contractname | html %]</a>
>+                            <a href="[% loo.script_name | url %]?op=add_form&amp;booksellerid=[% loo.booksellerid | uri %]&amp;contractnumber=[% loo.contractnumber | uri %]">[% loo.contractname | html %]</a>
>                         </td>
>                         <td>[% loo.contractdescription | html %]</td>
>                         <td>[% loo.contractstartdate | html %]</td>
>                         <td>[% loo.contractenddate | html %]</td>
>                         <td class="actions">
>-                            <a href="[% loo.script_name | uri %]?op=add_form&amp;contractnumber=[% loo.contractnumber | uri %]&amp;booksellerid=[% loo.booksellerid | uri %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a>
>-                            <a href="[% loo.script_name | uri %]?op=delete_confirm&amp;contractnumber=[% loo.contractnumber | uri %]&amp;booksellerid=[% loo.booksellerid | uri %]" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a>
>+                            <a href="[% loo.script_name | url %]?op=add_form&amp;contractnumber=[% loo.contractnumber | uri %]&amp;booksellerid=[% loo.booksellerid | uri %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a>
>+                            <a href="[% loo.script_name | url %]?op=delete_confirm&amp;contractnumber=[% loo.contractnumber | uri %]&amp;booksellerid=[% loo.booksellerid | uri %]" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a>
>                         </td>
>                         </tr>
>                     [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt
>index 14bc1b5aa7..ef6d8dde86 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt
>@@ -301,7 +301,7 @@
>                 [% IF ( loo.value_builder ) %] | <strong>Plugin:</strong>[% loo.value_builder | html %],[% END %]
>             [% END %]
>         </td>
>-        <td><a href="[% loo.delete | uri %]" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a></td>
>+        <td><a href="[% loo.delete | url %]" class="btn btn-default btn-xs"><i class="fa fa-trash"></i> Delete</a></td>
>     </tr>
>     [% END %]
> </table>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt
>index cb57caf085..1c1ce55de5 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt
>@@ -213,9 +213,9 @@
>                     <a class="btn btn-default btn-xs dropdown-toggle" id="authtagactions[% loo.tagfield | html %]" role="button" data-toggle="dropdown" href="#">
>                         Actions <b class="caret"></b></a>
>                     <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="authtagactions[% loo.tagfield | html %]">
>-                        <li><a href="[% loo.subfield_link | uri %]"><i class="fa fa-eye"></i> Subfields</a></li>
>-                        <li><a href="[% loo.edit | uri %]"><i class="fa fa-pencil"></i> Edit</a></li>
>-                        <li><a href="[% loo.delete | uri %]"><i class="fa fa-trash"></i> Delete</a></li>
>+                        <li><a href="[% loo.subfield_link | url %]"><i class="fa fa-eye"></i> Subfields</a></li>
>+                        <li><a href="[% loo.edit | url %]"><i class="fa fa-pencil"></i> Edit</a></li>
>+                        <li><a href="[% loo.delete | url %]"><i class="fa fa-trash"></i> Delete</a></li>
>                     </ul>
>                 </div>
>             </td>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
>index f0219ef11f..4c23852185 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
>@@ -222,7 +222,7 @@
>                             [% IF library.branchemail %]
>                                 <br /><a href="mailto:[% library.branchemail | uri %]">[% library.branchemail | html %]</a>[% END %]
>                             [% IF library.branchurl %]
>-                                <br /><a href="[% library.branchurl | uri %]">[% library.branchurl | html %]</a>[% END %]
>+                                <br /><a href="[% library.branchurl | url %]">[% library.branchurl | html %]</a>[% END %]
>                             [% IF library.opac_info %]
>                                 <br />OPAC Info: <div>[% library.opac_info | $raw %]</div>[% END %]
>                             [% IF library.branchnotes %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt
>index 5882915cde..f8b14364f0 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt
>@@ -188,8 +188,8 @@
> [% IF ( display_lists ) %]
> 
> <div id="toolbar" class="btn-toolbar">
>-    <a class="btn btn-default btn-sm" id="newsource" href="[% script_name | html %]?op=add_source"><i class="fa fa-plus"></i> New classification source</a>
>-    <a class="btn btn-default btn-sm" id="newrule" href="[% script_name | html %]?op=add_sort_rule"><i class="fa fa-plus"></i> New filing rule</a>
>+    <a class="btn btn-default btn-sm" id="newsource" href="[% script_name | url %]?op=add_source"><i class="fa fa-plus"></i> New classification source</a>
>+    <a class="btn btn-default btn-sm" id="newrule" href="[% script_name | url %]?op=add_sort_rule"><i class="fa fa-plus"></i> New filing rule</a>
> </div>
> 
> <h2>Classification sources</h2>
>@@ -220,8 +220,8 @@
>     <td>[% IF ( class_source.used ) %]Yes[% ELSE %]No[% END %]</td>
>     <td>[% class_source.sortrule | html %]</td>
>     <td class="actions">
>-      <a class="btn btn-default btn-xs" href="[% class_source.script_name | html %]?op=edit_source&amp;class_source=[% class_source.code | html %]"><i class="fa fa-pencil"></i> Edit</a>
>-      <a class="btn btn-default btn-xs" href="[% class_source.script_name | html %]?op=delete_source&amp;class_source=[% class_source.code | html %]"><i class="fa fa-trash"></i> Delete</a>
>+      <a class="btn btn-default btn-xs" href="[% class_source.script_name | url %]?op=edit_source&amp;class_source=[% class_source.code | uri %]"><i class="fa fa-pencil"></i> Edit</a>
>+      <a class="btn btn-default btn-xs" href="[% class_source.script_name | url %]?op=delete_source&amp;class_source=[% class_source.code | uri %]"><i class="fa fa-trash"></i> Delete</a>
>     </td>
>   </tr>
>   [% END %]
>@@ -253,8 +253,8 @@
>     <td>[% class_sort_rule.description | html %]</td>
>     <td>[% class_sort_rule.sort_routine | html %]</td>
>     <td class="actions">
>-      <a class="btn btn-default btn-xs" href="[% class_sort_rule.script_name | html %]?op=edit_sort_rule&amp;sort_rule=[% class_sort_rule.rule | html %]"><i class="fa fa-pencil"></i> Edit</a>
>-      <a class="btn btn-default btn-xs" href="[% class_sort_rule.script_name | html %]?op=delete_sort_rule&amp;sort_rule=[% class_sort_rule.rule | html %]"><i class="fa fa-trash"></i> Delete</a>
>+      <a class="btn btn-default btn-xs" href="[% class_sort_rule.script_name | url %]?op=edit_sort_rule&amp;sort_rule=[% class_sort_rule.rule | uri %]"><i class="fa fa-pencil"></i> Edit</a>
>+      <a class="btn btn-default btn-xs" href="[% class_sort_rule.script_name | url %]?op=delete_sort_rule&amp;sort_rule=[% class_sort_rule.rule | uri %]"><i class="fa fa-trash"></i> Delete</a>
>     </td>
>   </tr>
>   [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt
>index 8d21ec534e..6c77aba1ca 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt
>@@ -96,7 +96,7 @@
> </ol></fieldset> 
>     <fieldset class="action">
>         <input type="submit" value="Save changes" />
>-        <a class="cancel" href="[% script_name | html %]?frameworkcode=[% framework.frameworkcode | html %]">Cancel</a>
>+        <a class="cancel" href="[% script_name | url %]?frameworkcode=[% framework.frameworkcode | html %]">Cancel</a>
>     </fieldset>
>     </form>
> [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt
>index d6faee903d..b84e2b57e4 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt
>@@ -433,7 +433,7 @@
> [% IF ( display_list ) %]
> 
> <div id="toolbar" class="btn-toolbar">
>-    <a class="btn btn-default btn-sm" id="newrule" href="[% script_name | html %]?op=add_matching_rule"><i class="fa fa-plus"></i> New record matching rule</a>
>+    <a class="btn btn-default btn-sm" id="newrule" href="[% script_name | url %]?op=add_matching_rule"><i class="fa fa-plus"></i> New record matching rule</a>
> </div>
> 
> <h2>Record matching rules</h2>
>@@ -459,8 +459,8 @@
>     <td>[% available_matching_rule.code | html %]</td>
>     <td>[% available_matching_rule.description | html %]</td>
>     <td class="actions">
>-      <a class="btn btn-default btn-xs" href="[% available_matching_rule.script_name | html %]?op=edit_matching_rule&amp;matcher_id=[% available_matching_rule.matcher_id | html %]"><i class="fa fa-pencil"></i> Edit</a>
>-      <a class="btn btn-default btn-xs" href="[% available_matching_rule.script_name | html %]?op=delete_matching_rule&amp;matcher_id=[% available_matching_rule.matcher_id | html %]"><i class="fa fa-trash"></i> Delete</a>
>+      <a class="btn btn-default btn-xs" href="[% available_matching_rule.script_name | url %]?op=edit_matching_rule&amp;matcher_id=[% available_matching_rule.matcher_id | uri %]"><i class="fa fa-pencil"></i> Edit</a>
>+      <a class="btn btn-default btn-xs" href="[% available_matching_rule.script_name | url %]?op=delete_matching_rule&amp;matcher_id=[% available_matching_rule.matcher_id | uri %]"><i class="fa fa-trash"></i> Delete</a>
>     </td>
>   </tr>
>   [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt
>index 0ad7467271..1a43a50f98 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt
>@@ -218,7 +218,7 @@
> [% IF ( display_list ) %]
> 
> <div id="toolbar" class="btn-toolbar">
>-    <a class="btn btn-default btn-sm" id="newrule" href="[% script_name | html %]?op=add_attribute_type"><i class="fa fa-plus"></i> New patron attribute type</a>
>+    <a class="btn btn-default btn-sm" id="newrule" href="[% script_name | url %]?op=add_attribute_type"><i class="fa fa-plus"></i> New patron attribute type</a>
> </div>
> 
> <h2>Patron attribute types</h2>
>@@ -276,8 +276,8 @@
>                 [% END %]
>             </td>
>             <td class="actions">
>-              <a class="btn btn-default btn-xs" href="[% item.script_name | html %]?op=edit_attribute_type&amp;code=[% item.code | html %]"><i class="fa fa-pencil"></i> Edit</a>
>-              <a class="btn btn-default btn-xs" href="[% item.script_name | html %]?op=delete_attribute_type&amp;code=[% item.code | html %]"><i class="fa fa-trash"></i> Delete</a>
>+              <a class="btn btn-default btn-xs" href="[% item.script_name | url %]?op=edit_attribute_type&amp;code=[% item.code | uri %]"><i class="fa fa-pencil"></i> Edit</a>
>+              <a class="btn btn-default btn-xs" href="[% item.script_name | url %]?op=delete_attribute_type&amp;code=[% item.code | uri %]"><i class="fa fa-trash"></i> Delete</a>
>             </td>
>           </tr>
>         [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tt
>index c38b67f714..11fb85192e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tt
>@@ -154,7 +154,7 @@
> 			<td>[% loo.printername | html %]</td>
> 			<td>[% loo.printqueue | html %]</td>
> 			<td>[% loo.printtype | html %]</td>
>-            <td class="actions"><a class="btn btn-default btn-xs" href="[% loo.script_name | html %]?op=add_form&amp;searchfield=[% loo.printername |uri %]"><i class="fa fa-pencil"></i> Edit</a> <a class="btn btn-default btn-xs" href="[% loo.script_name | html %]?op=delete_confirm&amp;searchfield=[% loo.printername |uri %]"><i class="fa fa-trash"></i> Delete</a></td>
>+            <td class="actions"><a class="btn btn-default btn-xs" href="[% loo.script_name | url %]?op=add_form&amp;searchfield=[% loo.printername |uri %]"><i class="fa fa-pencil"></i> Edit</a> <a class="btn btn-default btn-xs" href="[% loo.script_name | url %]?op=delete_confirm&amp;searchfield=[% loo.printername |uri %]"><i class="fa fa-trash"></i> Delete</a></td>
> 		</tr>
> 		[% END %]
>         </tbody>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt
>index 21da724654..57b459ed01 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt
>@@ -236,7 +236,7 @@
>     [% IF ( else ) %]
> 
>     <div id="toolbar" class="btn-toolbar">
>-        <a class="btn btn-default btn-sm" id="newstopword" href="[% script_name | html %]?op=add_form"><i class="fa fa-plus"></i> New preference</a>
>+        <a class="btn btn-default btn-sm" id="newstopword" href="[% script_name | url %]?op=add_form"><i class="fa fa-plus"></i> New preference</a>
>     </div>
> 
>     [% IF ( tab != 'local_use' ) %]
>@@ -255,7 +255,7 @@
>     <tbody>[% FOREACH loo IN loop %]
>         <tr>
> 
>-        <td><strong><a href="[% loo.edit | uri %]">[% loo.variable | html %]</a></strong></td><td> [% loo.explanation | html %]</td>
>+        <td><strong><a href="[% loo.edit | url %]">[% loo.variable | html %]</a></strong></td><td> [% loo.explanation | html %]</td>
>         [% IF ( loo.oneline ) %]
>         <td class="single-line">
>         [% ELSE %]
>@@ -364,7 +364,7 @@
>             </form>
>         </td>
> 
>-        <td class="actions"><a class="btn btn-default btn-xs" href="[% loo.edit | html %]"><i class="fa fa-pencil"></i> Edit</a> <a class="btn btn-default btn-xs" href="[% loo.delete | html %]"><i class="fa fa-trash"></i> Delete</a></td>
>+        <td class="actions"><a class="btn btn-default btn-xs" href="[% loo.edit | url %]"><i class="fa fa-pencil"></i> Edit</a> <a class="btn btn-default btn-xs" href="[% loo.delete | url %]"><i class="fa fa-trash"></i> Delete</a></td>
>     </tr>
>     [% END %]</tbody>
>     </table>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt
>index 749f720007..0f8ea78bed 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt
>@@ -206,7 +206,7 @@
>                             <label for="MyPublicLink">See your public page: </label>
>                             [% IF Koha.Preference('UsageStatsPublicID') %]
>                                 [% SET my_url = 'https://hea.koha-community.org/libraries/' _  Koha.Preference('UsageStatsPublicID') %]
>-                                <a href="[% my_url | uri %]">[% my_url | html %]</a>
>+                                <a href="[% my_url | url %]">[% my_url | html %]</a>
>                             [% ELSE %]
>                                 You do not have anything public yet.
>                             [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt
>index 1b85d54b71..19548caf57 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt
>@@ -43,7 +43,7 @@
> [% IF too_many_login_attempts %]
>     <div id="login_error"><strong>Error: </strong>This account has been locked!</div>
>     [% IF Koha.Preference('OpacResetPassword') && Koha.Preference('OpacBaseURL') %]
>-        <a href="[% Koha.Preference('OpacBaseURL') | uri %]/cgi-bin/koha/opac-password-recovery.pl">You must reset your password</a>.
>+        <a href="[% Koha.Preference('OpacBaseURL') | url %]/cgi-bin/koha/opac-password-recovery.pl">You must reset your password</a>.
>     [% END %]
> [% ELSIF invalid_username_or_password %]
> <div id="login_error"><strong>Error: </strong>Invalid username or password</div>
>@@ -54,7 +54,7 @@
> [% IF (invalidShibLogin ) %]
> <div id="login_error"><Strong>Error: </strong>Shibboleth login failed</div>
> [% END %]
>-<p>If you have a shibboleth account, please <a href="[% shibbolethLoginUrl | uri %]">click here</a> to login.</p>
>+<p>If you have a shibboleth account, please <a href="[% shibbolethLoginUrl | url %]">click here</a> to login.</p>
> [% END %]
> 
> 
>@@ -95,14 +95,14 @@
> [% END %]
> 
> [% IF ( casServerUrl ) %]
>-    <p><a href="[% casServerUrl | uri %]">If you have a CAS account, please click here to login</a>.<p>
>+    <p><a href="[% casServerUrl | url %]">If you have a CAS account, please click here to login</a>.<p>
> [% END %]
> 
> [% IF ( casServersLoop ) %]
>     <p>If you have a CAS account, please choose against which one you would like to authenticate:</p>
> <ul>
>     [% FOREACH casServer IN casServersLoop %]
>-        <li><a href="[% casServer.value | uri %]">[% casServer.name | html %]</a></li>
>+        <li><a href="[% casServer.value | url %]">[% casServer.name | html %]</a></li>
>     [% END %]
> [% END %]
> [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt
>index 57b8256604..b861a0f455 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt
>@@ -156,7 +156,7 @@
>                                                 [% FOREACH MARCNOTE IN BIBLIO_RESULT.MARCNOTES %]
>                                                     <p>
>                                                     [% IF MARCNOTE.marcnote.match('^https?://\S+$') %]
>-                                                        - <a href="[% MARCNOTE.marcnote | uri %]">[% MARCNOTE.marcnote | html %]</a>
>+                                                        - <a href="[% MARCNOTE.marcnote | url %]">[% MARCNOTE.marcnote | html %]</a>
>                                                     [% ELSE %]
>                                                         - [% MARCNOTE.marcnote | html %]
>                                                     [% END %]
>@@ -207,7 +207,7 @@
>                                             <td>
>                                                [% FOREACH MARCurl IN BIBLIO_RESULT.MARCURLS %]
>                                                     [% IF MARCurl.part %]<p>[% MARCurl.part | html %]</p>[% END %]
>-                                                    <a href="[% MARCurl.MARCURL | uri %]" title="[% MARCurl.MARCURL | html %]">[% MARCurl.linktext | html %]</a>
>+                                                    <a href="[% MARCurl.MARCURL | url %]" title="[% MARCurl.MARCURL | html %]">[% MARCurl.linktext | html %]</a>
>                                                     [% IF MARCurl.notes %]
>                                                         [% FOREACH note IN MARCurl.notes %]
>                                                             <p>[% note.note | html %]</p>
>@@ -262,7 +262,7 @@
>                                             <input type="checkbox" class="select_record" value="[% BIBLIO_RESULT.biblionumber | html %]" name="bib[% BIBLIO_RESULT.biblionumber | html %]" id="bib[% BIBLIO_RESULT.biblionumber | html %]" />
>                                         </td>
>                                         <td>
>-                                            <a href="[% BIBLIO_RESULT.dest | uri %]?biblionumber=[% BIBLIO_RESULT.biblionumber | uri %]" class="open_title">
>+                                            <a href="[% BIBLIO_RESULT.dest | url %]?biblionumber=[% BIBLIO_RESULT.biblionumber | uri %]" class="open_title">
>                                                 [% BIBLIO_RESULT.title |html %]
>                                                 [% FOREACH subtitl IN BIBLIO_RESULT.subtitle %]
>                                                     [% subtitl.subfield | html %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/batch/print-notices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/batch/print-notices.tt
>index 11939e9e74..a134ff5596 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/batch/print-notices.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/batch/print-notices.tt
>@@ -12,7 +12,7 @@
>         -->
>     </style>
>     [% IF ( stylesheet ) %]
>-    <link rel="stylesheet" type="text/css" href="[% stylesheet | html %]">
>+    <link rel="stylesheet" type="text/css" href="[% stylesheet | url %]">
>     [% END %]
> </head>
> <body id="batch_print-notices" class="batch">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt
>index f030e0cfcd..e549122ef0 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt
>@@ -75,7 +75,7 @@
>                     <span class="subfield-label">&nbsp;
>                     [% UNLESS ( subfiel.hide_marc ) %]<span class="subfield-code">[% subfiel.marc_subfield | html %]</span>[% END %]
>                     <span class="desc" title="[% subfiel.long_desc | html %]">[% subfiel.short_desc | html %]</span></span>
>-                    [% IF ( subfiel.is_url ) %]<a href="[% subfiel.marc_value | uri %]">[% subfiel.marc_value | html %]</a>[% ELSE %][% subfiel.marc_value | html %][% END %]
>+                    [% IF ( subfiel.is_url ) %]<a href="[% subfiel.marc_value | url %]">[% subfiel.marc_value | html %]</a>[% ELSE %][% subfiel.marc_value | html %][% END %]
>                     [% IF ( subfiel.link ) %]
>                         <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;idx=[% subfiel.link | uri %],phr&amp;type=intranet&amp;q=[% subfiel.marc_value |url %]">
>                             <img src="[% interface | html %]/[% theme | html %]/img/filefind.png" height="15" title="Search on [% subfiel.marc_value | html %]" alt="Search on [% subfiel.marc_value | html %]" />
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
>index d3f499fc57..d9d479f9d2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
>@@ -188,7 +188,7 @@
> 		<li>[% IF ( MARCurl.part ) %][% MARCurl.part | html %]
> 			<br />[% END %] 
> 		
>-        <a href="[% MARCurl.MARCURL | uri %]" title="[% MARCurl.MARCURL | html %]">[% MARCurl.linktext | html %]</a>
>+        <a href="[% MARCurl.MARCURL | url %]" title="[% MARCurl.MARCURL | html %]">[% MARCurl.linktext | html %]</a>
> 			[% IF ( MARCurl.notes ) %]<ul>[% FOREACH note IN MARCurl.notes %]<li>[% note.note | html %]</li>[% END %]</ul>[% END %]</li>
>             [% END %]</ul>
> </li>
>@@ -196,7 +196,7 @@
> 
>     [% IF ( OPACBaseURL ) %]
>         <li><strong>OPAC view:</strong>
>-        <a href="[% OPACBaseURL | uri %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber | uri %]" target="_blank">Open in new window</a>
>+        <a href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber | uri %]" target="_blank">Open in new window</a>
>         </li>
>     [% END %]
>         <li id="catalogue_detail_marc_preview">
>@@ -260,7 +260,7 @@
>         [% IF ( urlS ) %]
>             <li><strong>URL:</strong>
>                 [% FOREACH url IN urlS %]
>-                    <a href="[% url.url | uri %]">[% url.url | html %]</a>
>+                    <a href="[% url.url | url %]">[% url.url | html %]</a>
>                 [% END %]
>             </li>
>         [% END %]
>@@ -500,7 +500,7 @@
>                     <td class="dateaccessioned"><span title="[% item.dateaccessioned | html %]">[% item.dateaccessioned | $KohaDates %]</span></td>
>                     <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?type=[% item.type | uri %]&amp;itemnumber=[% item.itemnumber | uri %]&amp;biblionumber=[% item.biblionumber | uri %]&amp;bi=[% item.biblioitemnumber | uri %]#item[% item.itemnumber | uri %]">[% item.barcode | html %]</a></td>
>                     [% IF ( itemdata_uri ) %]
>-                        <td class="uri"><a href="[% item.uri | uri %]">[% item.uri | html %]</a></td>
>+                        <td class="uri"><a href="[% item.uri | url %]">[% item.uri | html %]</a></td>
>                     [% END %]
>                     [% IF ( itemdata_copynumber ) %]
>                         <td class="copynumber">[% item.copynumber | html %]</td>
>@@ -626,7 +626,7 @@
>     [% FOREACH MARCNOTE IN MARCNOTES %]
>         <p>
>         [% IF MARCNOTE.marcnote.match('^https?://\S+$') %]
>-            <a href="[% MARCNOTE.marcnote | uri %]">[% MARCNOTE.marcnote | html %]</a>
>+            <a href="[% MARCNOTE.marcnote | url %]">[% MARCNOTE.marcnote | html %]</a>
>         [% ELSE %]
>             [% MARCNOTE.marcnote FILTER html_line_break | html %]
>         [% END %]
>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 ac8000dee1..4c5933dc94 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
>@@ -470,7 +470,7 @@
> 
>                           [% IF ( OPACBaseURL ) %]
>                               <span class="view-in-opac">
>-                                | <a href="[% Koha.Preference('OPACBaseURL') | uri %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | uri %]" target="_blank">OPAC view</a>
>+                                | <a href="[% Koha.Preference('OPACBaseURL') | url %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | uri %]" target="_blank">OPAC view</a>
>                               </span>
>                           [% END %]
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
>index 7d88b902d0..2584e2a31f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
>@@ -225,7 +225,7 @@ function confirm_deletion() {
>                           [% END %]
>                         [% END %]
>                             [% IF ( OPACBaseURL ) %]
>-                                <li class="view-in-opac"><a target="_blank" href="[% Koha.Preference('OPACBaseURL') | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber | html %]">OPAC view</a></li>
>+                                <li class="view-in-opac"><a target="_blank" href="[% Koha.Preference('OPACBaseURL') | url %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber | uri %]">OPAC view</a></li>
>                             [% END %]
>                           </ul>
>                           </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt
>index c9935fbe66..d6c38ec6c2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt
>@@ -13,7 +13,7 @@
> [% END %]
> [% INCLUDE 'doc-head-close.inc' %]
> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
>-<link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon | html %][% ELSE %][% interface | html %]/[% theme | html %]/img/favicon.ico[% END %]" type="image/x-icon" />
>+<link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon | %][% ELSE %][% interface | html %]/[% theme | html %]/img/favicon.ico[% END %]" type="image/x-icon" />
> [% Asset.css("css/print.css") | $raw %]
> [% IF ( Koha.Preference('SlipCSS') ) %]
> <link rel="stylesheet" type="text/css" href="[% Koha.Preference('SlipCSS') | $raw %]" />
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
>index c7850d4913..4ebfc5ba22 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
>@@ -28,7 +28,7 @@
> 
>         <h2>Holds awaiting pickup for your library on: [% show_date | $KohaDates %]
>             [% IF ( all_branches_link ) %]
>-            <span style="margin-left:20px"><a href="[% all_branches_link | uri %]">
>+            <span style="margin-left:20px"><a href="[% all_branches_link | url %]">
>             View all libraries</a></span>
>             [% END %]
>         </h2>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt
>index f7984731ef..c34d14eaab 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt
>@@ -156,9 +156,9 @@
> 
>                             <td>
>                                 [% IF (cr.item.uri) %]
>-                                    <a href="[% cr.item.uri | uri %]">Item URI</a>
>+                                    <a href="[% cr.item.uri | url %]">Item URI</a>
>                                 [% ELSIF (cr.biblioitem.url) %]
>-                                    <a href="[% cr.biblioitem.url | uri %]">Record URL</a>
>+                                    <a href="[% cr.biblioitem.url | url %]">Record URL</a>
>                                 [% END %]
>                             </td>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
>index bc6f40a936..bb64ca98b9 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
>@@ -406,7 +406,7 @@
>                             </fieldset>
>                             <fieldset class="action">
>                                 <input type="submit" class="btn btn-default" value="Send email"/>
>-                                <span><a href="[% ill_url | uri %]" title="Return to request details">Cancel</a></span>
>+                                <span><a href="[% ill_url | url %]" title="Return to request details">Cancel</a></span>
>                             </fieldset>
>                         </form>
>                     [% ELSE %]
>@@ -414,7 +414,7 @@
>                             <legend>Interlibrary loan request details</legend>
>                             <p>No partners have been defined yet. Please create appropriate patron records (by default ILLLIBS category).</p>
>                             <p>Be sure to provide email addresses for these patrons.</p>
>-                            <p><span><a href="[% ill_url | uri %]" title="Return to request details">Cancel</a></span></p>
>+                            <p><span><a href="[% ill_url | url %]" title="Return to request details">Cancel</a></span></p>
>                         </fieldset>
>                     [% END %]
>                 
>@@ -531,7 +531,7 @@
>                                 <div class="borrowernumber">
>                                     <span class="label borrowernumber">Patron:</span>
>                                     [% borrowerlink = "/cgi-bin/koha/members/moremember.pl" _ "?borrowernumber=" _ request.patron.borrowernumber %]
>-                                    <a href="[% borrowerlink | uri %]" title="View borrower details">
>+                                    <a href="[% borrowerlink | url %]" title="View borrower details">
>                                     [% request.patron.firstname _ " " _ request.patron.surname _ " [" _ request.patron.cardnumber _ "]" | html %]
>                                     </a>
>                                 </div>
>@@ -626,7 +626,7 @@
>                                 [% FOREACH comment IN request.illcomments %]
>                                     <div class="rows comment_[% comment.patron.categorycode | html %]">
>                                     <h5>Comment by:
>-                                    <a href="[% borrowerlink | uri %]" title="View borrower details">
>+                                    <a href="[% borrowerlink | url %]" title="View borrower details">
>                                     [% comment.patron.firstname _ " " _ comment.patron.surname _ " [" _ comment.patron.cardnumber _ "]" | html %]</a>
>                                     [% comment.timestamp | $KohaDates with_hours => 1 %]</h5>
>                                     <p>[% comment.comment | html %]</p>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
>index ab18d6809d..6c551b0697 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
>@@ -234,7 +234,7 @@ canned reports and writing custom SQL reports.</p>
>                         </td>
>                         <td class="report_json_url">
>                         [% IF (savedreport.public) %]
>-                            <a href="[% OPACBaseURL | uri %]/cgi-bin/koha/svc/report?id=[% savedreport.id | uri %]">[% OPACBaseURL | html %]/cgi-bin/koha/svc/report?id=[% savedreport.id | html %]</a>
>+                            <a href="[% OPACBaseURL | url %]/cgi-bin/koha/svc/report?id=[% savedreport.id | uri %]">[% OPACBaseURL | html %]/cgi-bin/koha/svc/report?id=[% savedreport.id | html %]</a>
>                         [% ELSE %]
>                             <a href="/cgi-bin/koha/svc/report?id=[% savedreport.id | uri %]">[% Koha.Preference('staffClientBaseURL') | html %]/cgi-bin/koha/svc/report?id=[% savedreport.id | html %]</a>
>                         [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt
>index aa81f216f3..5876983ad8 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-batchedit.tt
>@@ -155,7 +155,7 @@
> 
>                         <fieldset class="action">
>                             <button type="submit" name="batchedit" value="1">Save</button>
>-                            <a class="cancel" href="[% referrer | html %]">Cancel</a>
>+                            <a class="cancel" href="[% referrer | url %]">Cancel</a>
>                         </fieldset>
>                     </form>
>                 </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
>index f37f5e4e51..1c15bd37c2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
>@@ -84,7 +84,7 @@
>         [% IF ( OPACBaseURL ) %]
>             <li>
>                 <span class="label">OPAC view:</span>
>-                <a id="view-subscription-in-opac" target="_blank" href="[% Koha.Preference('OPACBaseURL') | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber | html %]">Open in new window.</a>
>+                <a id="view-subscription-in-opac" target="_blank" href="[% Koha.Preference('OPACBaseURL') | url %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblionumber | uri %]">Open in new window.</a>
>             </li>
>         [% END %]
> [% IF ( branchcode ) %]<li><span class="label">Library:</span> [% Branches.GetName( branchcode ) | html %]</li>[% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
>index 869a742903..eebe3cd432 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
>@@ -405,7 +405,7 @@
> 			<input type="text" readonly="readonly" id="total" name="total" size="10" value="[% total | html %]"/>
>                 </li></ol>
>     </fieldset><input type="hidden" id="returnsuggested" name="returnsuggested" value="[% IF ( returnsuggestedby ) %][% returnsuggestedby | html %][% ELSE %]noone[% END %]"/>
>-    <fieldset class="action"><input type="hidden" name="op" value="[% op | html %]" />[% IF ( suggestionid ) %]<input type="submit" value="Save" /> <a class="cancel" href="[% IF ( returnsuggestedby ) %]/cgi-bin/koha/members/moremember.pl?borrowernumber=[% returnsuggestedby | html %]#suggestions[% ELSE %]suggestion.pl[% END %]">Cancel</a>[% ELSE %]<input type="submit" value="Submit your suggestion" /> <a class="cancel" href="suggestion.pl">Cancel</a>[% END %]
>+    <fieldset class="action"><input type="hidden" name="op" value="[% op | html %]" />[% IF ( suggestionid ) %]<input type="submit" value="Save" /> <a class="cancel" href="[% IF ( returnsuggestedby ) %]/cgi-bin/koha/members/moremember.pl?borrowernumber=[% returnsuggestedby | uri %]#suggestions[% ELSE %]suggestion.pl[% END %]">Cancel</a>[% ELSE %]<input type="submit" value="Submit your suggestion" /> <a class="cancel" href="suggestion.pl">Cancel</a>[% END %]
>     </fieldset>
>     </form>
> [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt
>index 0579328b3b..64721ce04e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt
>@@ -118,7 +118,7 @@
>     <ul>
>     [% FOREACH simple_items_displa IN simple_items_display %]
>         <li>
>-            <a href="[% simple_items_displa.itemnumber | uri %]">[% simple_items_displa.barcode | html %]</a>
>+            <a href="[% simple_items_displa.itemnumber | url %]">[% simple_items_displa.barcode | html %]</a>
>         </li>
>     [% END %]
>     </ul>
>@@ -164,7 +164,7 @@
>             [% IF src == 'CATALOGUING' # from catalogue/detail.pl > Delete items in a batch%]
>                 <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]">Return to the record</a>
>             [% ELSIF src %]
>-                <a href="[% src | uri %]">Return to where you were</a>
>+                <a href="[% src | url %]">Return to where you were</a>
>             [% ELSE %]
>                 <a href="/cgi-bin/koha/tools/batchMod.pl?del=1">Return to batch item deletion</a>
>             [% END %]
>@@ -199,7 +199,7 @@
>         [% IF src == 'CATALOGUING' # from catalogue/detail.pl > Delete items in a batch%]
>            <a class="btn btn-default" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | html %]"><i class="fa fa-check-square-o"></i> Return to the record</a>
>         [% ELSIF src %]
>-           <a class="btn btn-default" href="[% src | html %]"><i class="fa fa-check-square-o"></i> Return to where you were</a>
>+           <a class="btn btn-default" href="[% src | url %]"><i class="fa fa-check-square-o"></i> Return to where you were</a>
>         [% ELSE %]
>            <a class="btn btn-default" href="/cgi-bin/koha/tools/batchMod.pl?del=1"><i class="fa fa-check-square-o"></i> Return to batch item deletion</a>
>         [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt
>index 3c09313370..222ae2740b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt
>@@ -79,7 +79,7 @@ $(document).ready(function(){
>                   [% IF src == 'CATALOGUING' # from catalogue/detail.pl > Edit items in a batch%]
>                       <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | uri %]">Return to the record</a>
>                   [% ELSIF src %]
>-                      <a href="[% src | uri %]">Return to where you were</a>
>+                      <a href="[% src | url %]">Return to where you were</a>
>                   [% ELSE %]
>                       <a href="/cgi-bin/koha/tools/batchMod.pl">Return to batch item modification</a>
>                   [% END %]
>@@ -289,7 +289,7 @@ $(document).ready(function(){
> [% IF src == 'CATALOGUING' # from catalogue/detail.pl > Edit items in a batch%]
>    <a class="btn btn-default" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber | html %]"><i class="fa fa-check-square-o"></i> Return to the record</a>
> [% ELSIF src %]
>-   <a class="btn btn-default" href="[% src | html %]"><i class="fa fa-check-square-o"></i> Return to where you were</a>
>+   <a class="btn btn-default" href="[% src | url %]"><i class="fa fa-check-square-o"></i> Return to where you were</a>
> [% ELSE %]
>    <a class="btn btn-default" href="/cgi-bin/koha/tools/batchMod.pl"><i class="fa fa-check-square-o"></i> Return to batch item modification</a>
> [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt
>index dd0671f052..f3b7a021c6 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt
>@@ -21,7 +21,7 @@
> <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> 
> [% IF ( import_batch_id ) %]
>  &rsaquo;
>- <a href="[% script_name | uri %]">Manage staged MARC records</a>
>+ <a href="[% script_name | url %]">Manage staged MARC records</a>
>  &rsaquo; Batch [% import_batch_id | html %]
> [% ELSE %]
>  &rsaquo; Manage staged MARC records
>@@ -266,7 +266,7 @@
>       [% IF ( page.current_page ) %]
>       <span class="current">[% page.page_number | html %]</span>
>       [% ELSE %]
>-      <a href="[% page.script_name | uri %]?offset=[% page.offset | uri %]">[% page.page_number | html %]</a>
>+      <a href="[% page.script_name | url %]?offset=[% page.offset | uri %]">[% page.page_number | html %]</a>
>       [% END %]
>     [% END %]
> </div>
>@@ -286,7 +286,7 @@
>   [% FOREACH batch_lis IN batch_list %]
>     <tr>
>     <td>[% batch_lis.import_batch_id | html %]</td>
>-    <td><a href="[% batch_lis.script_name | uri %]?import_batch_id=[% batch_lis.import_batch_id | uri %]">[% batch_lis.file_name | html %]</a></td>
>+    <td><a href="[% batch_lis.script_name | url %]?import_batch_id=[% batch_lis.import_batch_id | uri %]">[% batch_lis.file_name | html %]</a></td>
>     <td>[% batch_lis.comments | html %]</td>
>     <td>[% IF ( batch_lis.record_type == 'auth' ) %]Authority[% ELSE %]Bibliographic[% END %]</td>
>     <td>
>@@ -308,7 +308,7 @@
>     </td>
>     <td>[% batch_lis.upload_timestamp | html %]</td>
>     <td>[% batch_lis.num_records | html %]</td>
>-    <td>[% batch_lis.num_items | html %][% IF ( batch_lis.num_items ) %] <a href="[% batch_lis.script_name | uri %]?import_batch_id=[% batch_lis.import_batch_id | uri %]&amp;op=create_labels">(Create label batch)</a>[% END %]</td>
>+    <td>[% batch_lis.num_items | html %][% IF ( batch_lis.num_items ) %] <a href="[% batch_lis.script_name | url %]?import_batch_id=[% batch_lis.import_batch_id | uri %]&amp;op=create_labels">(Create label batch)</a>[% END %]</td>
>     <td class="actions">
>         [% IF ( batch_lis.can_clean ) %]
>           <form method="post" action="[% batch_lis.script_name | html %]" name="clean_batch_[% batch_lis.import_batch_id | html %]" id="clean_batch_[% batch_lis.import_batch_id | html %]" class="batch_form batch_clean" >
>@@ -333,7 +333,7 @@
>       [% IF ( page.current_page ) %]
>       <span class="current">[% page.page_number | html %]</span>
>       [% ELSE %]
>-      <a href="[% page.script_name | uri %]?offset=[% page.offset | uri %]">[% page.page_number | html %]</a>
>+      <a href="[% page.script_name | url %]?offset=[% page.offset | uri %]">[% page.page_number | html %]</a>
>       [% END %]
>     [% END %]
> </div>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/authorities-search-results.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/authorities-search-results.inc
>index a309e01856..5cf2e6044b 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/authorities-search-results.inc
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/authorities-search-results.inc
>@@ -22,7 +22,7 @@
>         <span class="heading">
>         [% IF ( linkType=='seealso' ) %]
>             [% IF ( authid ) %]
>-            <a href="[% authidurl | url %][% authid | url %]">[% heading | html %]</a>
>+            <a href="[% authidurl | url %][% authid | uri %]">[% heading | html %]</a>
>             [% ELSE %]
>             <a href="[% searchurl | url %][% heading | uri %]">[% heading | html %]</a>
>             [% END %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc
>index 22160e92de..ad2217e500 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc
>@@ -19,13 +19,13 @@
> 
> [% SET opaclayoutstylesheet='opac.css' UNLESS opaclayoutstylesheet %]
> [% IF (opaclayoutstylesheet.match('^https?:|^\/')) %]
>-    <link rel="stylesheet" type="text/css" href="[% opaclayoutstylesheet | html %]" />
>+    <link rel="stylesheet" type="text/css" href="[% opaclayoutstylesheet | url %]" />
> [% ELSE %]
>     [% Asset.css("css/" _ opaclayoutstylesheet) | $raw %]
> [% END %]
> [% IF ( OpacAdditionalStylesheet ) %]
>     [% IF (OpacAdditionalStylesheet.match('^https?:|^\/')) %]
>-        <link rel="stylesheet" type="text/css" href="[% OpacAdditionalStylesheet | html %]" />
>+        <link rel="stylesheet" type="text/css" href="[% OpacAdditionalStylesheet | url %]" />
>     [% ELSE %]
>         <link rel="stylesheet" type="text/css" href="[% interface | html %]/[% theme | html %]/css/[% OpacAdditionalStylesheet | html %]" />
>     [% END %]
>@@ -44,7 +44,7 @@
>         <style>[% SCOUserCSS | $raw %]</style>
>     [% END %]
> [% END %]
>-<link rel="unapi-server" type="application/xml" title="unAPI" href="[% OPACBaseURL | html %]/cgi-bin/koha/unapi" />
>+<link rel="unapi-server" type="application/xml" title="unAPI" href="[% OPACBaseURL | url %]/cgi-bin/koha/unapi" />
> [% PROCESS cssinclude %]
> 
> 
>-                <a href="[% OPACBaseURL | uri %]/cgi-bin/koha/opac-news-rss.pl?branchcode=[% branchcode | uri %]"><img src="[% interface | html %]/[% theme | html %]/images/feed-icon-16x16.png"></a>
>+                <a href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-news-rss.pl?branchcode=[% branchcode | uri %]"><img src="[% interface | html %]/[% theme | html %]/images/feed-icon-16x16.png"></a>
>                 [% IF Branches.all.size == 1 %]
>                     [% IF branchcode %]
>                         RSS feed for [% Branches.GetName( branchcode ) | html %] library news.
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-news-rss.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-news-rss.tt
>index 64a4a47ecb..d3935e6d2f 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-news-rss.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-news-rss.tt
>@@ -2,7 +2,7 @@
> <?xml version="1.0"?>
> <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
>    <channel>
>-      <atom:link href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-main.pl" rel="self" type="application/rss+xml" />
>+      <atom:link href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-main.pl" rel="self" type="application/rss+xml" />
>       <title>News from [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]the library[% END %]</title>
>       <link>[% OPACBaseURL | html %]/cgi-bin/koha/opac-main.pl</link>
>       <description></description>
>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 c69585a49c..b1611b94f6 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt
>@@ -20,7 +20,7 @@
>    <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 | html %]/cgi-bin/koha/opac-search.pl?[% query_cgi |uri %][% limit_cgi |uri %]&amp;sort_by=[% sort_by | uri %]&amp;format=rss2"/>
>+     <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"/>
>      <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 +30,7 @@
>        <opensearch:itemsPerPage>20</opensearch:itemsPerPage>
>      [% END %]
> 	 [% FOREACH SEARCH_RESULT IN SEARCH_RESULTS %]
>-     <atom:link rel="search" type="application/opensearchdescription+xml" href="[% OPACBaseURL | html %]/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 |uri %][% SEARCH_RESULT.limit_cgi |uri %]&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>
>@@ -54,7 +54,7 @@
>                         [% IF ( SEARCH_RESULT.isbn ) %] [% SEARCH_RESULT.isbn | html %][% END %]
>        </p>
> [% IF Koha.Preference( 'RequestOnOpac' ) == 1 %]
>-<p><a href="[% OPACBaseURL | uri %]/cgi-bin/koha/opac-reserve.pl?biblionumber=[% SEARCH_RESULT.biblionumber | uri %]">Place Hold on <i>[% SEARCH_RESULT.title | html %]</i></a></p>
>+<p><a href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-reserve.pl?biblionumber=[% SEARCH_RESULT.biblionumber | uri %]">Place Hold on <i>[% SEARCH_RESULT.title | html %]</i></a></p>
> [% END %]
> 						]]></description>
>        <guid>[% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %]</guid>
>@@ -69,7 +69,7 @@
>        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>
>    <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 | html %]/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 |uri %][% limit_cgi |uri %]&amp;format=rss2"/>
>    <updated>[% timestamp | html %]</updated>
>    <author>
>      <name>[% LibraryName | html %]</name>
>@@ -83,18 +83,18 @@
>      <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 | html %]/cgi-bin/koha/opac-search.pl?[% query_cgi | html %][% limit_cgi | html %]pw=[% page | html %]&amp;format=atom" type="application/atom+xml"/>
>-   <link rel="self" href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?[% query_cgi | html %][% limit_cgi | html %]&amp;format=atom" type="application/atom+xml"/>
>-   <link rel="first" href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?[% query_cgi | html %][% limit_cgi | html %]pw=1&amp;format=atom" type="application/atom+xml"/>
>-   <link rel="previous" href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?[% query_cgi | html %][% limit_cgi | html %]pw=2&amp;format=atom" type="application/atom+xml"/>
>-   <link rel="next" href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?[% query_cgi | html %][% limit_cgi | html %]pw=4&amp;format=atom" type="application/atom+xml"/>
>-   <link rel="last" href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?[% query_cgi | html %][% limit_cgi | html %]pw=42299&amp;format=atom" type="application/atom+xml"/>
>-   <link rel="search" type="application/opensearchdescription+xml" href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?format=opensearchdescription"/>
>+   <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="search" type="application/opensearchdescription+xml" href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-search.pl?format=opensearchdescription"/>
> 
>    [% FOREACH SEARCH_RESULT IN SEARCH_RESULTS %]
>    <entry>
>      <title>[% SEARCH_RESULT.title | html %]</title>
>-     <link href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %]"/>
>+     <link href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | uri %]"/>
>      
>      <updated>[% SEARCH_RESULT.timestamp | html %]</updated>
>      <content type="text">
>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 7bb678abe6..aaf60fbc92 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
>@@ -18,7 +18,7 @@
>     [% END %]
> [% END %]
> 
>-<link rel="alternate" type="application/rss+xml" title="[% LibraryName | html %] Search RSS feed" href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?[% query_cgi | url %][% limit_cgi |uri %]&amp;count=[% countrss |uri %]&amp;sort_by=acqdate_dsc&amp;format=rss2" />
>+<link rel="alternate" type="application/rss+xml" title="[% LibraryName | html %] Search RSS feed" 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" />
> </head>
> 
> [% INCLUDE 'bodytag.inc' bodyid='results' bodyclass='scrollto' %]
>@@ -43,14 +43,14 @@
>                         <strong>No results found!</strong>
>                         <p>
>                             [% IF ( searchdesc ) %]
>-                                No results found for that in [% LibraryName | html %] catalog. <a href="[% OPACBaseURL | uri %]/cgi-bin/koha/opac-search.pl?[% query_cgi | url %][% limit_cgi | html | 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 | 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>
>                             [% ELSE %]
>                                 You did not specify any search criteria.
>                             [% END %]
>                         </p>
>                         [% IF ( ReturnPath ) %]
>                            <div class="returntosearch">
>-                                <p><a href="[% ReturnPath | uri %]">Return to the last advanced search</a></p>
>+                                <p><a href="[% ReturnPath | url %]">Return to the last advanced search</a></p>
>                             </div>
>                         [% END %]
>                         [% IF ( OPACNoResultsFound ) %]
>@@ -87,7 +87,7 @@
>                                 [% END %]
>                             ).
>                         [% END %]
>-                        <a href="[% OPACBaseURL | uri %]/cgi-bin/koha/opac-search.pl?[% query_cgi | url %][% limit_cgi |html | 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 | 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>
>                     [% END # / IF total %]
>                     </p>
>                 [% END # / IF searchdesc %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt
>index 063da8d974..008deeab73 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt
>@@ -71,7 +71,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="[% OPACBaseURL | uri %]/cgi-bin/koha/opac-search.pl?[% query_cgi |html |url %][% limit_cgi |html | url %]&amp;[% s.query_cgi | uri %]&amp;count=[% countrss | uri %]&amp;sort_by=acqdate_dsc&amp;format=rss2" class="rsssearchlink"><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="/cgi-bin/koha/opac-search.pl?[% s.query_cgi | html %]">[% s.query_desc | html %]</a></td>
>+                                                        <td><a href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-search.pl?[% query_cgi |url %][% limit_cgi | url %]&amp;[% s.query_cgi | uri %]&amp;count=[% countrss | uri %]&amp;sort_by=acqdate_dsc&amp;format=rss2" class="rsssearchlink"><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="/cgi-bin/koha/opac-search.pl?[% s.query_cgi | html %]">[% s.query_desc | html %]</a></td>
>                                                         <td>[% s.total | html %]</td>
>                                                     </tr>
>                                                 [% END %]
>@@ -111,7 +111,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="[% OPACBaseURL | uri %]/cgi-bin/koha/opac-search.pl?[% query_cgi |html |url %][% limit_cgi |html | url %]&amp;[% s.query_cgi | uri %]&amp;count=[% countrss | uri %]&amp;sort_by=acqdate_dsc&amp;format=rss2" class="rsssearchlink"><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="/cgi-bin/koha/opac-search.pl?[% s.query_cgi | html %]">[% s.query_desc | html %]</a></td>
>+                                                    <td><a href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-search.pl?[% query_cgi |url %][% limit_cgi | url %]&amp;[% s.query_cgi | uri %]&amp;count=[% countrss | uri %]&amp;sort_by=acqdate_dsc&amp;format=rss2" class="rsssearchlink"><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="/cgi-bin/koha/opac-search.pl?[% s.query_cgi | html %]">[% s.query_desc | html %]</a></td>
>                                                     <td>[% s.total | html %]</td>
>                                                 </tr>
>                                             [% END %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
>index e343a5b873..1f553fe367 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
>@@ -151,7 +151,7 @@
>                     [% IF shelf AND op == 'view' %]
>                         <h3>
>                             [% shelf.shelfname | html %]
>-                            <a href="[% OPACBaseURL | uri %]/cgi-bin/koha/opac-shelves.pl?rss=1&amp;op=view&amp;shelfnumber=[% shelf.shelfnumber | uri %]" class="rss-list-link noprint">
>+                            <a href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-shelves.pl?rss=1&amp;op=view&amp;shelfnumber=[% shelf.shelfnumber | uri %]" class="rss-list-link noprint">
>                                 <img src="[% interface | html %]/[% theme | html %]/images/feed-icon-16x16.png" alt="Subscribe to this list" title="Subscribe to this list" border="0" class="rsssearchicon"/>
>                             </a>
>                         </h3>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews-rss.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews-rss.tt
>index d05a984501..78995d76ac 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews-rss.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews-rss.tt
>@@ -4,7 +4,7 @@
>      <title><![CDATA[[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] Catalog Recent Comments]]></title>
>      <link>[% OPACBaseURL | html %]/cgi-bin/koha/opac-showreviews.pl&amp;format=rss2</link>
>      <description><![CDATA[ The most recent comments from [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] Catalog. Comments can be made by logged in users and are moderated by library staff.]]></description>
>-     <atom:link href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-showreviews.pl&amp;format=rss2" rel="self" type="application/rss+xml" />
>+     <atom:link href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-showreviews.pl&amp;format=rss2" rel="self" type="application/rss+xml" />
>      <lastBuildDate>[% timestamp | html %]</lastBuildDate>
> 	 [% FOREACH review IN reviews %]
>      <item>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt
>index 13a5d23a8f..10f297d18d 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt
>@@ -5,7 +5,7 @@
> <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog &rsaquo; Recent comments</title>
> [% INCLUDE 'doc-head-close.inc' %]
> [% BLOCK cssinclude %][% END %]
>-<link rel="alternate" type="application/rss+xml" title="[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog recent comments" href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-showreviews.pl?format=rss" />
>+<link rel="alternate" type="application/rss+xml" title="[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog recent comments" href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-showreviews.pl?format=rss" />
> </head>
> [% INCLUDE 'bodytag.inc' bodyid='opac-showreviews' bodyclass='scrollto' %]
> [% INCLUDE 'masthead.inc' %]
>@@ -29,7 +29,7 @@
>                     <div class="span12">
>                 [% END %]
>                    <div id="showreviews" class="searchresults maincontent">
>-                        <h3>Recent comments <a href="[% OPACBaseURL | uri %]/cgi-bin/koha/opac-showreviews.pl?format=rss" class="rsssearchlink"><img src="[% interface | html %]/[% theme | html %]/images/feed-icon-16x16.png" alt="Subscribe to recent comments" title="Subscribe to recent comments" border="0" class="rsssearchicon"/></a></h3>
>+                        <h3>Recent comments <a href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-showreviews.pl?format=rss" class="rsssearchlink"><img src="[% interface | html %]/[% theme | html %]/images/feed-icon-16x16.png" alt="Subscribe to recent comments" title="Subscribe to recent comments" border="0" class="rsssearchicon"/></a></h3>
>                         <table class="table table-striped">
>                             [% FOREACH review IN reviews %]
>                                 <tr>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt
>index 6a96883cac..d9fb7a5368 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt
>@@ -26,7 +26,7 @@
> <meta name="generator" content="Koha [% Version | html %]" /> 
> 
> [% IF ( Koha.Preference('OpacFavicon') ) %]
>-<link rel="shortcut icon" href="[% Koha.Preference('OpacFavicon') | html %]" type="image/x-icon" />
>+<link rel="shortcut icon" href="[% Koha.Preference('OpacFavicon') | url %]" type="image/x-icon" />
> [% ELSE %]
> <link rel="shortcut icon" href="[% interface | html %]/[% theme | html %]/images/favicon.ico" type="image/x-icon" />
> [% END %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt
>index ca8ad5f5b5..185a201aca 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt
>@@ -5,7 +5,7 @@
> <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha [% END %] &rsaquo; Self checkout help</title>
> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
> <meta name="generator" content="Koha [% Version | html %]" /> 
>-<link rel="shortcut icon" href="[% IF ( OpacFavicon  ) %][% OpacFavicon | html %][% ELSE %][% interface | html %]/[% theme | html %]/images/favicon.ico[% END %]" type="image/x-icon" />
>+<link rel="shortcut icon" href="[% IF ( OpacFavicon  ) %][% OpacFavicon | url %][% ELSE %][% interface | html %]/[% theme | html %]/images/favicon.ico[% END %]" type="image/x-icon" />
>  [% Asset.css("lib/bootstrap/css/bootstrap.min.css") | $raw %]
> [% Asset.css("lib/jquery/jquery-ui.css") | $raw %]
> [% Asset.css("css/sco.css") | $raw %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/printslip.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/printslip.tt
>index d090809859..b81a29100c 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/printslip.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/printslip.tt
>@@ -4,10 +4,10 @@
> [% INCLUDE 'doc-head-open.inc' %]
> <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha [% END %] &rsaquo; Self checkout &rsaquo; Print Receipt for [% borrowernumber | html %]</title>
> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
>-<link rel="shortcut icon" href="[% IF ( OpacFavicon  ) %][% OpacFavicon | html %][% ELSE %][% interface | html %]/[% theme | html %]/images/favicon.ico[% END %]" type="image/x-icon" />
>+<link rel="shortcut icon" href="[% IF ( OpacFavicon  ) %][% OpacFavicon | url %][% ELSE %][% interface | html %]/[% theme | html %]/images/favicon.ico[% END %]" type="image/x-icon" />
> [% Asset.css("css/print.css") | $raw %]
> [% IF stylesheet %]
>-<link rel="stylesheet" type="text/css" href="[% stylesheet | html %]" />
>+<link rel="stylesheet" type="text/css" href="[% stylesheet | url %]" />
> [% END %]
> 
> 
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt
>index 70a9f0af39..806a351501 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt
>@@ -8,7 +8,7 @@
> <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha [% END %] &rsaquo; Self checkout </title>
> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
> <meta name="generator" content="Koha [% Version | html %]" /> 
>-<link rel="shortcut icon" href="[% IF ( Koha.Preference('OpacFavicon') ) %][% Koha.Preference('OpacFavicon') | html %][% ELSE %][% interface | html %]/[% theme | html %]/images/favicon.ico[% END %]" type="image/x-icon" />
>+<link rel="shortcut icon" href="[% IF ( Koha.Preference('OpacFavicon') ) %][% Koha.Preference('OpacFavicon') | url %][% ELSE %][% interface | html %]/[% theme | html %]/images/favicon.ico[% END %]" type="image/x-icon" />
> [% Asset.css("lib/bootstrap/css/bootstrap.min.css") | $raw %]
> [% Asset.css("lib/jquery/jquery-ui.css") | $raw %]
> [% Asset.css("css/sco.css") | $raw %]
>diff --git a/misc/cronjobs/rss/lastAcquired-1.0.tt b/misc/cronjobs/rss/lastAcquired-1.0.tt
>index 3059e91606..4874574289 100644
>--- a/misc/cronjobs/rss/lastAcquired-1.0.tt
>+++ b/misc/cronjobs/rss/lastAcquired-1.0.tt
>@@ -32,7 +32,7 @@
> <br>[% place | html %] [% i.publishercode | html %] [% i.publicationyear | html %]
> <br>[% pages | html %] [% i.illus | html %] [% i.size | html %]
> [% IF i.notes %]<br><br>[% i.notes | html %][% END %]<br>
>-<a href="[% OPACBaseURL | uri %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% i.biblionumber | uri %]">View Details</a> | <a href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-reserve.pl?biblionumber=[% i.biblionumber | html %]">Reserve this Item</a>[% IF i.author %] | <a href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?marclist=biblio.author&amp;and_or=and&amp;excluding=&amp;operator=contains&amp;value=[% i.author | html %]&amp;resultsperpage=20&amp;orderby=biblio.title&amp;op=do_search">More by this Author</a>[% END %]
>+<a href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% i.biblionumber | uri %]">View Details</a> | <a href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-reserve.pl?biblionumber=[% i.biblionumber | uri %]">Reserve this Item</a>[% IF i.author %] | <a href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-search.pl?marclist=biblio.author&amp;and_or=and&amp;excluding=&amp;operator=contains&amp;value=[% i.author | uri %]&amp;resultsperpage=20&amp;orderby=biblio.title&amp;op=do_search">More by this Author</a>[% END %]
> ]]></description>
>  </item>
> [% END %]
>diff --git a/misc/cronjobs/rss/lastAcquired-2.0.tt b/misc/cronjobs/rss/lastAcquired-2.0.tt
>index 89ca3a5ecf..84ad435ca9 100644
>--- a/misc/cronjobs/rss/lastAcquired-2.0.tt
>+++ b/misc/cronjobs/rss/lastAcquired-2.0.tt
>@@ -25,7 +25,7 @@
> <br>[% IF i.publishercode %][% i.place | html %] [% i.publishercode | html %] [% publicationyear | html %]<br>[% END %]
> [% IF i.pages %][% i.pages | html %][% i.illus | html %][% i.size | html %][% END %]
> [% IF i.notes %]<p>[% i.notes | html %]</p>[% END %]<br>
>-<a href="[% OPACBaseURL | uri %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% i.biblionumber | uri %]">View Details</a> | <a href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-reserve.pl?biblionumber=[% i.biblionumber | html %]">Reserve this Item</a>[% IF i.author %] | <a href="[% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?marclist=biblio.author&amp;and_or=and&amp;excluding=&amp;operator=contains&amp;value=[% i.author | html %]&amp;resultsperpage=20&amp;orderby=biblio.title&amp;op=do_search">More by this Author</a>[% END %]
>+<a href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% i.biblionumber | uri %]">View Details</a> | <a href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-reserve.pl?biblionumber=[% i.biblionumber | uri %]">Reserve this Item</a>[% IF i.author %] | <a href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-search.pl?marclist=biblio.author&amp;and_or=and&amp;excluding=&amp;operator=contains&amp;value=[% i.author | uri %]&amp;resultsperpage=20&amp;orderby=biblio.title&amp;op=do_search">More by this Author</a>[% END %]
> ]]></description>
>  </item>
> [% END %]
>-- 
>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