Bugzilla – Attachment 21527 Details for
Bug 9735
Choose language using URL parameters in any page
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[PASSED QA] Bug 9735 - Build the cookie array correctly
PASSED-QA-Bug-9735---Build-the-cookie-array-correc.patch (text/plain), 2.61 KB, created by
Katrin Fischer
on 2013-09-27 20:51:07 UTC
(
hide
)
Description:
[PASSED QA] Bug 9735 - Build the cookie array correctly
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2013-09-27 20:51:07 UTC
Size:
2.61 KB
patch
obsolete
>From 6da4bd87b13d3fbb223007f1e8ad2b954e56da66 Mon Sep 17 00:00:00 2001 >From: Tomas Cohen Arazi <tomascohen@gmail.com> >Date: Wed, 5 Jun 2013 14:56:38 -0300 >Subject: [PATCH] [PASSED QA] Bug 9735 - Build the cookie array correctly >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > >The current implementation didn't build the cookie array correctly, >yielding login problems in some scenarios. > >Regards >To+ > >Sponsored-by: Universidad Nacional de Córdoba > >http://bugs.koha-community.org/show_bug.cgi?id=6735 >Signed-off-by: Julian Maurice <julian.maurice@biblibre.com> >Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> >--- > C4/Auth.pm | 25 ++++++++++++++++++------- > 1 file changed, 18 insertions(+), 7 deletions(-) > >diff --git a/C4/Auth.pm b/C4/Auth.pm >index e7ee475..7ff63cf 100644 >--- a/C4/Auth.pm >+++ b/C4/Auth.pm >@@ -133,10 +133,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'}, >@@ -280,10 +287,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 >@@ -465,7 +472,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); >-- >1.7.9.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 9735
:
15832
|
16081
|
16091
|
18490
|
18685
|
20915
|
21421
|
21422
|
21423
|
21526
| 21527 |
21528