From 47f1f6810231b680e14f499c07c0bf160f03fb37 Mon Sep 17 00:00:00 2001 From: Mason James Date: Thu, 29 Dec 2016 14:51:52 +1300 Subject: [PATCH] Revert "Bug 14598: Fix warning from effective_itemtype" This reverts commit 9f247faaed3275931222a81f20c007ee07ac2dbd. --- Koha/Schema/Result/Item.pm | 2 +- t/db_dependent/Items.t | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Koha/Schema/Result/Item.pm b/Koha/Schema/Result/Item.pm index 8da21cdc0a..ba49ded3a9 100644 --- a/Koha/Schema/Result/Item.pm +++ b/Koha/Schema/Result/Item.pm @@ -680,7 +680,7 @@ sub effective_itemtype { if ( $pref && $self->itype() ) { return $self->itype(); } else { - warn "item-level_itypes set but no itemtype set for item (".$self->itemnumber.")" + warn "item-level_itypes set but no itemtype set for item ($self->itemnumber)" if $pref; return $self->biblioitemnumber()->itemtype(); } diff --git a/t/db_dependent/Items.t b/t/db_dependent/Items.t index b878c73172..81a48a3ca3 100755 --- a/t/db_dependent/Items.t +++ b/t/db_dependent/Items.t @@ -276,7 +276,7 @@ subtest q{Test Koha::Database->schema()->resultset('Item')->itemtype()} => sub { $item->update(); my $effective_itemtype; warning_is { $effective_itemtype = $item->effective_itemtype() } - "item-level_itypes set but no itemtype set for item (".$item->itemnumber.")", + "item-level_itypes set but no itemtype set for item ($item->itemnumber)", '->effective_itemtype() raises a warning when falling back to bib-level'; ok( defined $effective_itemtype && -- 2.11.4.GIT