X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2FmenuXML.pl;h=1eed4edeb9e716a3e16b44042445aec0da26139f;hb=d4a434e1deba2695ef4d4a3fc0d51ac1b2044fb0;hp=245afa1376f8817d876327e71f220bb2c82927bb;hpb=05c6840d4fbb90cbe81e14427617793c45ba4714;p=kivitendo-erp.git

diff --git a/bin/mozilla/menuXML.pl b/bin/mozilla/menuXML.pl
index 245afa137..1eed4edeb 100644
--- a/bin/mozilla/menuXML.pl
+++ b/bin/mozilla/menuXML.pl
@@ -54,7 +54,7 @@ sub display {
   my $form     = $main::form;
   my %myconfig = %main::myconfig;
 
-  my $charset = $main::dbcharset || 'ISO-8859-1';
+  my $charset = $::lx_office_conf{system}->{dbcharset} || 'ISO-8859-1';
   my $callback            = $form->unescape($form->{callback});
   $callback               = URI->new($callback)->rel($callback) if $callback;
   $callback               = "login.pl?action=company_logo"      if $callback =~ /^(\.\/)?$/;
@@ -99,7 +99,7 @@ sub acc_menu {
 
   my $mainlevel = $form->{level};
   $mainlevel =~ s/$mainlevel--//g;
-  my $menu = Menu->new($::menufile);
+  my $menu = Menu->new("menu.ini");
 
   $| = 1;