diff --git a/opac/opac-page.pl b/opac/opac-page.pl index f60f1be72f..bd58bbc210 100755 --- a/opac/opac-page.pl +++ b/opac/opac-page.pl @@ -36,7 +36,7 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user( my $page_id = $query->param('page_id'); -my $homebranch = $ENV{OPAC_BRANCH_DEFAULT}; +my $homebranch = $ENV{OPAC_BRANCH_DEFAULT} //= ""; if ( C4::Context->userenv ) { $homebranch = C4::Context->userenv->{'branch'}; } @@ -45,7 +45,7 @@ my $page = Koha::AdditionalContents->find($page_id); if ( !$page || $page->category ne 'pages' - || $page->branchcode && $page->branchcode != $homebranch + || $page->branchcode && $page->branchcode ne $homebranch || $page->location ne 'opac_only' && $page->location ne 'staff_and_opac' ) { print $query->redirect('/cgi-bin/koha/errors/404.pl');