projects
/
koha.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug 17971: TT syntax for notices - Add support for plurals
[koha.git]
/
C4
/
Context.pm
diff --git
a/C4/Context.pm
b/C4/Context.pm
index
1866b1d
..
a50ddfd
100644
(file)
--- a/
C4/Context.pm
+++ b/
C4/Context.pm
@@
-413,7
+413,7
@@
sub preference {
$var = lc $var;
if ($use_syspref_cache) {
$var = lc $var;
if ($use_syspref_cache) {
- $syspref_cache = Koha::Cache
->get_instance(
) unless $syspref_cache;
+ $syspref_cache = Koha::Cache
s->get_instance('syspref'
) unless $syspref_cache;
my $cached_var = $syspref_cache->get_from_cache("syspref_$var");
return $cached_var if defined $cached_var;
}
my $cached_var = $syspref_cache->get_from_cache("syspref_$var");
return $cached_var if defined $cached_var;
}
@@
-847,7
+847,7
@@
sub userenv {
C4::Context->set_userenv($usernum, $userid, $usercnum,
$userfirstname, $usersurname,
$userbranch, $branchname, $userflags,
C4::Context->set_userenv($usernum, $userid, $usercnum,
$userfirstname, $usersurname,
$userbranch, $branchname, $userflags,
- $emailaddress, $branchprinter, $
persona
);
+ $emailaddress, $branchprinter, $
shibboleth
);
Establish a hash of user environment variables.
Establish a hash of user environment variables.
@@
-858,7
+858,7
@@
set_userenv is called in Auth.pm
#'
sub set_userenv {
shift @_;
#'
sub set_userenv {
shift @_;
- my ($usernum, $userid, $usercnum, $userfirstname, $usersurname, $userbranch, $branchname, $userflags, $emailaddress, $branchprinter, $
persona, $
shibboleth)=
+ my ($usernum, $userid, $usercnum, $userfirstname, $usersurname, $userbranch, $branchname, $userflags, $emailaddress, $branchprinter, $shibboleth)=
map { Encode::is_utf8( $_ ) ? $_ : Encode::decode('UTF-8', $_) } # CGI::Session doesn't handle utf-8, so we decode it here
@_;
my $var=$context->{"activeuser"} || '';
map { Encode::is_utf8( $_ ) ? $_ : Encode::decode('UTF-8', $_) } # CGI::Session doesn't handle utf-8, so we decode it here
@_;
my $var=$context->{"activeuser"} || '';
@@
-874,7
+874,6
@@
sub set_userenv {
"flags" => $userflags,
"emailaddress" => $emailaddress,
"branchprinter" => $branchprinter,
"flags" => $userflags,
"emailaddress" => $emailaddress,
"branchprinter" => $branchprinter,
- "persona" => $persona,
"shibboleth" => $shibboleth,
};
$context->{userenv}->{$var} = $cell;
"shibboleth" => $shibboleth,
};
$context->{userenv}->{$var} = $cell;