From: Sven Schöling <s.schoeling@linet-services.de>
Date: Wed, 4 Jan 2012 14:17:59 +0000 (+0100)
Subject: Wiederherstellen von Sessionvariablen nicht von aktuellen Formeinträgen klobbern... 
X-Git-Tag: release-2.7.0beta1~102
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=ec52855f4ae863d612705fc55dcb8b2277bea3cc;p=kivitendo-erp.git

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

Fix für Bugs 1769 und 1767.
---

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;