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>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

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 faed2b2..758c7ba 100644 (file)
--- 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 ]
                 <a href="/cgi-bin/koha/module/page.pl"> Module page </a>
             [ END ]
-            [ WRAPPER breadcrumb_item active = 1 ]
+            [ WRAPPER breadcrumb_item bc_active = 1 ]
                 Add form
             [ END ]
 
@@ -420,12 +420,12 @@
             [ WRAPPER breadcrumb_item ]
                 <a href="/cgi-bin/koha/module/page.pl"> Module page </a>
             [ 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 ) %]
         <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 b71bcd2..98235c8 100644 (file)
--- 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 %]