From 0d6b153d2873668a04490f66c6a0b3ac9f262f82 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Tue, 7 Oct 2025 09:25:41 +0200
Subject: [PATCH] Bug 40818: Remove HTML from marc_lib

Signed-off-by: David Cook <dcook@prosentient.com.au>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Baptiste Wojtkowski <baptiste.wojtkowski@biblibre.com>
---
 Koha/UI/Form/Builder/Item.pm                              | 6 +-----
 koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/Koha/UI/Form/Builder/Item.pm b/Koha/UI/Form/Builder/Item.pm
index cbc52522c3..264300372b 100644
--- a/Koha/UI/Form/Builder/Item.pm
+++ b/Koha/UI/Form/Builder/Item.pm
@@ -109,11 +109,7 @@ sub generate_subfield_form {
 
     $subfield_data{tag}      = $tag;
     $subfield_data{subfield} = $subfieldtag;
-    $subfield_data{marc_lib} =
-        "<span title=\""
-      . $subfield->{lib} . "\">"
-      . $subfield->{lib}
-      . "</span>";
+    $subfield_data{marc_lib}      = $subfield->{lib};
     $subfield_data{mandatory}     = $subfield->{mandatory};
     $subfield_data{important}     = $subfield->{important};
     $subfield_data{repeatable}    = $subfield->{repeatable};
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc
index 50d618f392..58ec971abf 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc
@@ -93,11 +93,7 @@
 
             <li>
                 <div class="subfield_line" style="[% subfield.visibility | html %]" id="subfield[% subfield.tag | html %][% subfield.subfield | html %][% subfield.random | html %]">
-                    [% IF ( subfield.mandatory ) %]
-                        <label class="required">[% subfield.subfield | html %] - [% subfield.marc_lib | $raw %]</label>
-                    [% ELSE %]
-                       <label>[% subfield.subfield | html %] - [% subfield.marc_lib | $raw %]</label>
-                    [% END %]
+                    <label [% IF subfield.mandatory %]class="required"[% END %]>[% subfield.subfield | html %] - <span title="[% subfield.marc_lib | html %]">[% subfield.marc_lib | $raw %]</span></label>
 
                     [% SET mv = subfield.marc_value %]
                     [% IF ( mv.type == 'hidden' ) %]