From 6709d0e4f7bf82c2110167fda132dd06e171eff3 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Mon, 7 Feb 2011 17:09:01 -0500
Subject: [PATCH] Follow-up correction for Bug 5462 - Fix variable names for
 template::toolkit

Previous commit modified checks for the item-level_itypes preference
to look for a different variable name but didn't update where that
variable is set in Auth.pm.

Other scripts perform a direct check of item-level_itypes and must
continue to use the name of the variable in the database.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
---
 C4/Auth.pm           | 2 +-
 opac/opac-reserve.pl | 2 +-
 opac/opac-search.pl  | 2 +-
 reserve/request.pl   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/C4/Auth.pm b/C4/Auth.pm
index 130974ea0d..39eb50fe91 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -332,7 +332,7 @@ sub get_template_and_user {
             LoginSurname                 => C4::Context->userenv?C4::Context->userenv->{"surname"}:"Inconnu",
             TagsEnabled                  => C4::Context->preference("TagsEnabled"),
             hide_marc                    => C4::Context->preference("hide_marc"),
-            'item-level_itypes'          => C4::Context->preference('item-level_itypes'),
+            item_level_itypes            => C4::Context->preference('item-level_itypes'),
             patronimages                 => C4::Context->preference("patronimages"),
             singleBranchMode             => C4::Context->preference("singleBranchMode"),
             XSLTDetailsDisplay           => C4::Context->preference("XSLTDetailsDisplay"),
diff --git a/opac/opac-reserve.pl b/opac/opac-reserve.pl
index 3d547b744a..f4181d675b 100755
--- a/opac/opac-reserve.pl
+++ b/opac/opac-reserve.pl
@@ -290,7 +290,7 @@ my $biblioLoop = [];
 my $numBibsAvailable = 0;
 my $itemdata_enumchron = 0;
 my $anyholdable;
-my $itemLevelTypes = C4::Context->preference('item_level_itypes');
+my $itemLevelTypes = C4::Context->preference('item-level_itypes');
 $template->param('item_level_itypes' => $itemLevelTypes);
 
 foreach my $biblioNum (@biblionumbers) {
diff --git a/opac/opac-search.pl b/opac/opac-search.pl
index 855aa93a49..0f526502e6 100755
--- a/opac/opac-search.pl
+++ b/opac/opac-search.pl
@@ -153,7 +153,7 @@ $template->param(search_languages_loop => $languages_limit_loop,);
 # load the Type stuff
 my $itemtypes = GetItemTypes;
 # the index parameter is different for item-level itemtypes
-my $itype_or_itemtype = (C4::Context->preference("item_level_itypes"))?'itype':'itemtype';
+my $itype_or_itemtype = (C4::Context->preference("item-level_itypes"))?'itype':'itemtype';
 my @itemtypesloop;
 my $selected=1;
 my $cnt;
diff --git a/reserve/request.pl b/reserve/request.pl
index a31b6e2135..7e513648eb 100755
--- a/reserve/request.pl
+++ b/reserve/request.pl
@@ -330,7 +330,7 @@ foreach my $biblionumber (@biblionumbers) {
         foreach my $itemnumber ( @{ $itemnumbers_of_biblioitem{$biblioitemnumber} } )    {
             my $item = $iteminfos_of->{$itemnumber};
             
-            unless (C4::Context->preference('item_level_itypes')) {
+            unless (C4::Context->preference('item-level_itypes')) {
                 $item->{itype} = $biblioitem->{itemtype};
             }
             
-- 
2.20.1