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

Bug 9735 - Build the cookie array correctly 

The current implementation didn't build the cookie array correctly,
yielding login problems in some scenarios.

Sponsored-by: Universidad Nacional de Córdoba

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
This commit is contained in:
Tomas Cohen Arazi 2013-06-05 14:56:38 -03:00 committed by Galen Charlton
parent 3b7c6932e5
commit 4cb139b9ce
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
C4/Auth.pm
View File

@ -136,10 +136,17 @@ VALUES ( ?, ?, ?, ?, ?,
EOQ
sub get_template_and_user {
my $in = shift;
my $template =
C4::Templates::gettemplate( $in->{'template_name'}, $in->{'type'}, $in->{'query'}, $in->{'is_plugin'} );
my ( $user, $cookie, $sessionID, $flags );
my $template = C4::Templates::gettemplate(
$in->{'template_name'},
$in->{'type'},
$in->{'query'},
$in->{'is_plugin'}
);
if ( $in->{'template_name'} !~m/maintenance/ ) {
( $user, $cookie, $sessionID, $flags ) = checkauth(
$in->{'query'},
@ -283,10 +290,10 @@ sub get_template_and_user {
$template->param( sessionID => $sessionID );
my ($total, $pubshelves) = C4::VirtualShelves::GetSomeShelfNames(undef, 'MASTHEAD');
$template->param(
pubshelves => $total->{pubtotal},
pubshelvesloop => $pubshelves,
);
$template->param(
pubshelves => $total->{pubtotal},
pubshelvesloop => $pubshelves,
);
}
# Anonymous opac search history
# If opac search history is enabled and at least one search has already been performed
@ -468,7 +475,11 @@ sub get_template_and_user {
# what to do
my $language = C4::Templates::getlanguage($in->{'query'},$in->{'type'});
my $languagecookie = C4::Templates::getlanguagecookie($in->{'query'},$language);
$cookie = [$cookie, $languagecookie];
if ( ref $cookie eq 'ARRAY' ) {
push @{ $cookie }, $languagecookie;
} else {
$cookie = [$cookie, $languagecookie];
}
}
return ( $template, $borrowernumber, $cookie, $flags);