Bug 11926: Package updates

[srvgit] / serials / member-search.pl

diff --git a/serials/member-search.pl b/serials/member-search.pl
index f027df5..dfeb373 100755 (executable)
--- a/serials/member-search.pl
+++ b/serials/member-search.pl
@@ -51,7 +51,7 @@ my $searchstring   = $cgi->param('member');
 my %categories_dislay;
 my ($template, $loggedinuser, $cookie);
     ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "serials/member-search.tmpl",
+    = get_template_and_user({template_name => "serials/member-search.tt",
                  query => $cgi,
                  type => "intranet",
                  authnotrequired => 0,
@@ -82,10 +82,13 @@ if (defined $member) {
 
 my ($count,$results);
 
-if (C4::Context->preference("IndependantBranches")){
-   if (C4::Context->userenv && C4::Context->userenv->{flags} % 2 !=1 && C4::Context->userenv->{'branch'}){
-        $$patron{branchcode}=C4::Context->userenv->{'branch'} unless (C4::Context->userenv->{'branch'} eq "insecure");
-   }
+if ( C4::Context->preference("IndependentBranches") ) {
+    if (   C4::Context->userenv
+        && !C4::Context->IsSuperLibrarian()
+        && C4::Context->userenv->{'branch'} )
+    {
+        $$patron{branchcode} = C4::Context->userenv->{'branch'};
+    }
 }
 $$patron{firstname}.="\%" if ($$patron{firstname});
 $$patron{surname}.="\%" if ($$patron{surname});