Attachment 145148 Details for Bug 32507 – Bug 32507: (follow-up) Change parameter name to avoid collisions

[patch] Bug 32507: (follow-up) Change parameter name to avoid collisions

Bug-32507-follow-up-Change-parameter-name-to-avoid.patch (text/plain), 2.37 KB, created by Martin Renvoize (ashimema) on 2023-01-09 14:53:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2023-01-09 14:53:49 UTC

Size: 2.37 KB

patch

obsolete

>From a5f5b0975effa4e81eedb7ec0b7b5fa96f1f683b Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>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 <martin.renvoize@ptfs-europe.com>
>---
> koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt   | 6 +++---
> 2 files changed, 4 insertions(+), 4 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 1d974c8bfa6..aa17fd7b90c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc
>@@ -357,7 +357,7 @@
> 
> [%# Used to build individual breadcrumb items in the breadcrumb nav %]
> [% BLOCK breadcrumb_item %]
>-    [% IF ( active ) %]
>+    [% IF ( bc_active ) %]
>         <li>
>             <a href="#" aria-current="page">
>                 [% 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 b71bcd2f722..98235c8215b 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 %]
>                 <a href="/cgi-bin/koha/admin/cities.pl">Cities</a>
>             [% END %]
>-            [% WRAPPER breadcrumb_item active = 1 %]
>+            [% WRAPPER breadcrumb_item bc_active = 1 %]
>                 [% IF city.cityid %]
>                     <span>Modify city</span>
>                 [% ELSE %]
>@@ -45,12 +45,12 @@
>             [% WRAPPER breadcrumb_item %]
>                 <a href="/cgi-bin/koha/admin/cities.pl">Cities</a>
>             [% 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.0

Actions: View | Diff | Splinter Review

Attachments on bug 32507: 144742 | 144754 | 145070 | 145147 | 145148 | 146400 | 146401