From 1a45cf29f0b5685636312fc6d58c04073bd80ce5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Demians?= Date: Mon, 26 Sep 2011 20:30:11 +0200 Subject: [PATCH 1/2] [3.4.x] Bug 6755 Followup setlanguagecookie used in 2 places --- installer/install.pl | 3 ++- opac/changelanguage.pl | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/installer/install.pl b/installer/install.pl index 687d35e..5b065e8 100755 --- a/installer/install.pl +++ b/installer/install.pl @@ -10,6 +10,7 @@ use IPC::Cmd; use C4::Context; use C4::Output; +use C4::Templates; use C4::Languages qw(getAllLanguages getTranslatedLanguages); use C4::Installer; @@ -22,7 +23,7 @@ my ( $template, $loggedinuser, $cookie ); my $all_languages = getAllLanguages(); if ( defined($language) ) { - setlanguagecookie( $query, $language, "install.pl?step=1" ); + C4::Templates::setlanguagecookie( $query, $language, "install.pl?step=1" ); } ( $template, $loggedinuser, $cookie ) = get_template_and_user( { diff --git a/opac/changelanguage.pl b/opac/changelanguage.pl index 22b73e4..0b31d43 100755 --- a/opac/changelanguage.pl +++ b/opac/changelanguage.pl @@ -18,11 +18,11 @@ #use strict; #use warnings; FIXME - Bug 2505 -use C4::Output; +use C4::Templates; use CGI; my $query = new CGI; my $language = $query->param('language'); my $url = $query->referer(); -setlanguagecookie( $query, $language, $url ); +C4::Templates::setlanguagecookie( $query, $language, $url ); -- 1.7.6.1