From 36c4d315c8b4bac116377d7fac4d9e51414c7f80 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Fri, 1 Mar 2024 16:01:13 +0100
Subject: [PATCH] Bug 35329: Fix conflict with 33457

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc    | 4 ++--
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt       | 2 +-
 .../intranet-tmpl/prog/en/modules/acqui/neworderempty.tt      | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt    | 2 +-
 .../intranet-tmpl/prog/en/modules/suggestion/suggestion.tt    | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
index 5a84c6395c..c481838b21 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
@@ -893,9 +893,9 @@
             parent_block.find(".info").hide();
             parent_block.find(".error").hide();
             if ( add_user(borrowernumber, borrowername) < 0 ) {
-                parent_block.find(".error").html(_("Patron '%s' is already in the list.").format(borrowername.escapeHtml())).show();
+                parent_block.find(".error").html(_("Patron '%s' is already in the list.").format(borrowername)).show();
             } else {
-                parent_block.find(".info").html(_("Patron '%s' added.").format(borrowername.escapeHtml())).show();
+                parent_block.find(".info").html(_("Patron '%s' added.").format(borrowername)).show();
             }
         }
         function modal_select_user(borrowernumber, data) {
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 6985b555a7..80fa9cda1f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
@@ -1189,7 +1189,7 @@
             if (ids.indexOf(borrowernumber.toString()) < 0) {
                 ids.push(borrowernumber);
                 $("#users_ids").val(ids.join(':'));
-                var li = '<li id="user_'+borrowernumber+'">'+borrowername.escapeHtml()
+                var li = '<li id="user_'+borrowernumber+'">'+borrowername
                 + ' <a href="#" data-borrowernumber="'+borrowernumber+'" class="del_user"><i class="fa fa-trash-can"></i> '
                     + _("Delete user") + '</a></li>';
                 $("#users_names").prepend(li);
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
index 790ea40189..e9b62396f1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
@@ -209,7 +209,7 @@
         if (ids.indexOf(borrowernumber.toString()) < 0) {
                 ids.push(borrowernumber);
                 $("#users_ids").val(ids.join(':'));
-                var li = '<li id="user_'+borrowernumber+'">'+borrowername.escapeHtml()
+                var li = '<li id="user_'+borrowernumber+'">'+borrowername
                     + ' [<a style="cursor:pointer" onclick="del_user('+borrowernumber+');">'
                     + _("Delete user") + '</a>]</li>';
                 $("#users_names").append(li);
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
index 638635ee3b..5528a85cab 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
@@ -564,7 +564,7 @@
                 if(borrowernumber && ids.indexOf(borrowernumber.toString()) == -1) {
                     var li = '<li id="user_' + borrowernumber + '">'
                         + '<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber='
-                        + borrowernumber + '">' + borrowername.escapeHtml() + '</a> '
+                        + borrowernumber + '">' + borrowername + '</a> '
                         + ' &bull; <a data-borrowernumber="' + borrowernumber + '" class="del_user" href="#"><i class="fa fa-trash-can"></i> '+_("Remove")+'</a> '
                         + '</li>';
                     $("#budget_users").prepend(li);
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 96f5d6ad20..19007aefde 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
@@ -1282,7 +1282,7 @@
             if (borrowernumber) {
                 var managerlink = '<a href="/cgi-bin/koha/members/moremember.pl'
                     + '?borrowernumber=' + borrowernumber + '">'
-                    + borrowername.escapeHtml() + '</a>';
+                    + borrowername + '</a>';
                 managedby_name.html(managerlink);
                 managedby.val(borrowernumber);
             }