From e562c3c708a25b16402ebb5df3bc713fa27eaed4 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 5 Jan 2023 18:44:47 +0000 Subject: [PATCH] Bug 32507: (follow-up) Change parameter name to avoid collisions The variable name "active" is very likely to already be set for other reasons, so changing the parameter name to "bc_active" to avoid problems. Signed-off-by: Martin Renvoize Signed-off-by: Tomas Cohen Arazi (cherry picked from commit bf05e0898b17f21e024dfa3df00452bdc59f29f7) Signed-off-by: Martin Renvoize --- koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc | 8 ++++---- koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) 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 1b13598e19..44e14c3212 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc @@ -412,7 +412,7 @@ [ WRAPPER breadcrumb_item ] Module page [ END ] - [ WRAPPER breadcrumb_item active = 1 ] + [ WRAPPER breadcrumb_item bc_active = 1 ] Add form [ END ] @@ -420,12 +420,12 @@ [ WRAPPER breadcrumb_item ] Module page [ END ] - [ WRAPPER breadcrumb_item active = 1 ] + [ WRAPPER breadcrumb_item bc_active = 1 ] Confirm deletion [ END ] [ ELSE ] - [ WRAPPER breadcrumb_item active = 1 ] + [ WRAPPER breadcrumb_item bc_active = 1 ] Module page [ END ] [ END #/IF op = add_form ] @@ -448,7 +448,7 @@ [%# Used to build individual breadcrumb items in the breadcrumb nav %] [% BLOCK breadcrumb_item %] - [% IF ( active ) %] + [% IF ( bc_active ) %]
  • [% content | $raw %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt index b71bcd2f72..98235c8215 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt @@ -33,7 +33,7 @@ [% WRAPPER breadcrumb_item %] Cities [% END %] - [% WRAPPER breadcrumb_item active = 1 %] + [% WRAPPER breadcrumb_item bc_active = 1 %] [% IF city.cityid %] Modify city [% ELSE %] @@ -45,12 +45,12 @@ [% WRAPPER breadcrumb_item %] Cities [% END %] - [% WRAPPER breadcrumb_item active = 1 %] + [% WRAPPER breadcrumb_item bc_active = 1 %] Confirm deletion of city [% END %] [% ELSE %] - [% WRAPPER breadcrumb_item active = 1 %] + [% WRAPPER breadcrumb_item bc_active = 1 %] Cities [% END %] [% END #/IF op = add_form %] -- 2.39.5