Bug 6755 Followup setlanguagecookie used in 2 places
authorFrédéric Demians <f.demians@tamil.fr>
Mon, 26 Sep 2011 18:30:11 +0000 (20:30 +0200)
committerChris Cormack <chrisc@catalyst.net.nz>
Mon, 26 Sep 2011 19:22:18 +0000 (08:22 +1300)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

installer/install.pl
opac/changelanguage.pl

index 687d35e..5b065e8 100755 (executable)
@@ -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(
     {
index 22b73e4..0b31d43 100755 (executable)
 #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 );