From ec52855f4ae863d612705fc55dcb8b2277bea3cc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sven=20Sch=C3=B6ling?= Date: Wed, 4 Jan 2012 15:17:59 +0100 Subject: [PATCH] =?utf8?q?Wiederherstellen=20von=20Sessionvariablen=20nich?= =?utf8?q?t=20von=20aktuellen=20Formeintr=C3=A4gen=20klobbern=20lassen.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Fix für Bugs 1769 und 1767. --- SL/Request.pm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/SL/Request.pm b/SL/Request.pm index 57b729798..0045b1928 100644 --- a/SL/Request.pm +++ b/SL/Request.pm @@ -212,16 +212,16 @@ sub read_cgi_input { } } + my $encoding = delete $temp_target->{INPUT_ENCODING} || $db_charset; + + _recode_recursively(SL::Iconv->new($encoding, $db_charset), $temp_target => $target) if keys %$target; + if ($target->{RESTORE_FORM_FROM_SESSION_ID}) { my %temp_form; $::auth->restore_form_from_session(delete $target->{RESTORE_FORM_FROM_SESSION_ID}, form => \%temp_form); _store_value($target, $_, $temp_form{$_}) for keys %temp_form; } - my $encoding = delete $temp_target->{INPUT_ENCODING} || $db_charset; - - _recode_recursively(SL::Iconv->new($encoding, $db_charset), $temp_target => $target) if keys %$target; - map { $target->{$_} = $temp_target->{$_} } keys %{ $temp_target }; $::lxdebug->leave_sub; -- 2.20.1