Wiederherstellen von Sessionvariablen nicht von aktuellen Formeinträgen klobbern...

[mfinanz.git] / SL / Request.pm

diff --git a/SL/Request.pm b/SL/Request.pm
index d339cb7be23e534a124552c1a069bda267b5dee7..0045b19283acf68b9e682d169e35ee313a14d31b 100644 (file)
--- a/SL/Request.pm
+++ b/SL/Request.pm
@@ -153,8 +153,8 @@ sub _recode_recursively {
         # though.
         $to->{$key} = $iconv->convert("" . $from->{$key});
       } else {
-        $to->{$key} = {} if 'HASH'  eq ref $from->{$key};
-        $to->{$key} = [] if 'ARRAY' eq ref $from->{$key};
+        $to->{$key} ||= {} if 'HASH'  eq ref $from->{$key};
+        $to->{$key} ||= [] if 'ARRAY' eq ref $from->{$key};
         _recode_recursively($iconv, $from->{$key}, $to->{$key});
       }
     }
@@ -167,8 +167,8 @@ sub _recode_recursively {
         # though.
         $from->[$idx] = $iconv->convert("" . $from->[$idx]);
       } else {
-        $to->[$idx] = {} if 'HASH'  eq ref $from->[$idx];
-        $to->[$idx] = [] if 'ARRAY' eq ref $from->[$idx];
+        $to->[$idx] ||= {} if 'HASH'  eq ref $from->[$idx];
+        $to->[$idx] ||= [] if 'ARRAY' eq ref $from->[$idx];
         _recode_recursively($iconv, $from->[$idx], $to->[$idx]);
       }
     }
@@ -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;