---
C4/Auth.pm | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/C4/Auth.pm b/C4/Auth.pm
index 8f42d76..102a1c4 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -296,7 +296,7 @@ sub get_template_and_user {
LoginBranchname =>
(C4::Context->userenv?C4::Context->userenv->{"branchname"}:"insecure"),
TemplateEncoding =>
C4::Context->preference("TemplateEncoding"),
advancedMARCEditor =>
C4::Context->preference("advancedMARCEditor"),
- canreservefromotherbranches =>
C4::Context->preference('canreservefromotherbranches'),
+ canreservefromotherbranches =>
C4::Context->preference('canreservefrIomotherbranches'),
intranetcolorstylesheet =>
C4::Context->preference("intranetcolorstylesheet"),
intranetreadinghistory =>
C4::Context->preference("intranetreadinghistory"),
intranetstylesheet =>
C4::Context->preference("intranetstylesheet"),
@@ -678,7 +678,9 @@ sub checkauth {
$branchname = GetBranchName($branchcode);
}
my $branches = GetBranches();
- if (C4::Context->boolean_preference('IndependantBranches')
&& C4::Context->boolean_preference('Autolocation')){
+ if (C4::Context->boolean_preference('IndependantBranches')
+ &&
C4::Context->boolean_preference('Autolocation')
+ && $type ne 'opac' ){
# we have to check they are coming from the right ip
range
my $domain = $branches->{$branchcode}->{'branchip'};
if ($ip !~ /^$domain/){
--
1.5.6.5
_______________________________________________
Koha-patches mailing list
[email protected]
http://lists.koha.org/mailman/listinfo/koha-patches
