X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=C4%2FContext.pm;h=fee87520c96768f06f860bd3f915c81cf19fdf4d;hb=209863e5e4c3a868f6ef052793f410826b2c082d;hp=7709f7effbf76e81f09c6f7ae8f165986316070f;hpb=9205e732fb76414c36ea1e88d5412706f9b3369b;p=koha.git

diff --git a/C4/Context.pm b/C4/Context.pm
index 7709f7effb..fee87520c9 100644
--- a/C4/Context.pm
+++ b/C4/Context.pm
@@ -1104,7 +1104,22 @@ set_userenv is called in Auth.pm
 
 #'
 sub set_userenv {
-    my ($usernum, $userid, $usercnum, $userfirstname, $usersurname, $userbranch, $branchname, $userflags, $emailaddress, $branchprinter, $persona)= @_;
+    my (
+        $usernum,      $userid,        $usercnum,   $userfirstname,
+        $usersurname,  $userbranch,    $branchname, $userflags,
+        $emailaddress, $branchprinter, $persona
+    ) = @_;
+    for (
+        $usernum,      $userid,        $usercnum,   $userfirstname,
+        $usersurname,  $userbranch,    $branchname, $userflags,
+        $emailaddress, $branchprinter, $persona
+      )
+    {
+        utf8::decode($_) if $_;
+    }
+
+    # CGI::Session doesn't handle utf-8, so we decode it here
+
     my $var=$context->{"activeuser"} || '';
     my $cell = {
         "number"     => $usernum,