X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FAuth.pm;h=d63b6a2f6bfa6b06d3da6372192b5cc4f0234df2;hb=d2799b104f9541f9ef47445f07c3bfadca7b5b7e;hp=ddd8233d3babeb26731accb35e025e330f969dc9;hpb=8a40e3dd0f638557b8c666fe708ccbc1ac709c4e;p=kivitendo-erp.git

diff --git a/SL/Auth.pm b/SL/Auth.pm
index ddd8233d3..d63b6a2f6 100644
--- a/SL/Auth.pm
+++ b/SL/Auth.pm
@@ -489,8 +489,12 @@ sub read_user {
     @user_data{qw(id login)}    = @{$ref}{qw(id login)};
   }
 
-  # The XUL/XML backed menu has been removed.
-  $user_data{menustyle} = 'v3' if lc($user_data{menustyle} || '') eq 'xml';
+  # The XUL/XML & 'CSS new' backed menus have been removed.
+  my %menustyle_map = ( xml => 'new', v4 => 'v3' );
+  $user_data{menustyle} = $menustyle_map{lc($user_data{menustyle} || '')} || $user_data{menustyle};
+
+  # Set default language if selected language does not exist (anymore).
+  $user_data{countrycode} = $::lx_office_conf{system}->{language} unless $user_data{countrycode} && -d "locale/$user_data{countrycode}";
 
   $sth->finish();