From ffd1ff2238aa4c7eaf16537467367d031e9de7bb Mon Sep 17 00:00:00 2001 From: Mason James Date: Mon, 31 Jul 2017 04:04:25 +1200 Subject: [PATCH] Revert "Bug 18613: Remove letter rule correctly as superlibrarian" This reverts commit ab019faecad351dc7f2df55db9487fdbbbb6c59f. --- C4/Letters.pm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/C4/Letters.pm b/C4/Letters.pm index 8c7af57e07..6842e4cdac 100644 --- a/C4/Letters.pm +++ b/C4/Letters.pm @@ -204,9 +204,11 @@ sub getletter { my ( $module, $code, $branchcode, $message_transport_type ) = @_; $message_transport_type //= '%'; - my $only_my_library = C4::Context->only_my_library; - if ( $only_my_library and $branchcode ) { - $branchcode = C4::Context::mybranch(); + if ( C4::Context->preference('IndependentBranches') + and $branchcode + and C4::Context->userenv ) { + + $branchcode = C4::Context->userenv->{'branch'}; } $branchcode //= ''; -- 2.39.5