gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bug_10019' into 3.14-master

This commit is contained in:
Jared Camins-Esakov 2013-04-19 23:13:24 -04:00
parent bd6cd72148 7e90e1524f
commit 4d883b4e73
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
C4/Auth.pm
View File

@ -675,6 +675,7 @@ sub checkauth {
$ip = $session->param('ip');
$lasttime = $session->param('lasttime');
$userid = $session->param('id');
utf8::decode($userid);
$sessiontype = $session->param('sessiontype') || '';
}
if ( ( ($query->param('koha_login_context')) && ($query->param('userid') ne $session->param('id')) )
@ -750,6 +751,7 @@ sub checkauth {
-HttpOnly => 1
);
$userid = $query->param('userid');
utf8::decode($userid);
if ( ( $cas && $query->param('ticket') )
|| $userid
|| ( my $pki_field = C4::Context->preference('AllowPKIAuth') ) ne