From f1f8fe2b96258e2f2217434dd10515839264683f Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Thu, 17 Apr 2014 10:18:26 -0400 Subject: [PATCH] Bug 10904 [QA Followup] - Use branch limit if either IndependentBranches or IndependentBranchesPatronModifications is enabled --- mainpage.pl | 3 ++- members/members-update.pl | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mainpage.pl b/mainpage.pl index e9ee176..3f8dac3 100755 --- a/mainpage.pl +++ b/mainpage.pl @@ -55,7 +55,8 @@ $template->param( ); my $branch = - C4::Context->preference("IndependentBranchesPatronModifications") + ( C4::Context->preference("IndependentBranchesPatronModifications") + || C4::Context->preference("IndependentBranches") ) && !$flags->{'superlibrarian'} ? C4::Context->userenv()->{'branch'} : undef; diff --git a/members/members-update.pl b/members/members-update.pl index ee1f7ee..ec0f3ee 100755 --- a/members/members-update.pl +++ b/members/members-update.pl @@ -42,7 +42,8 @@ my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user( ); my $branch = - C4::Context->preference("IndependentBranchesPatronModifications") + ( C4::Context->preference("IndependentBranchesPatronModifications") + || C4::Context->preference("IndependentBranches") ) && !$flags->{'superlibrarian'} ? C4::Context->userenv()->{'branch'} : undef; -- 1.7.2.5