X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FLayout%2FBase.pm;h=e39502f1f583a7136bf7b6ec897030322047327e;hb=6ba38ffedd99c9d3ade9134b01ac510c50d92d2e;hp=c470a05b675da292db36a808e2bf588ad7d2fb05;hpb=048f2af4cc81425f9148dac716c4c1ecf23ab020;p=kivitendo-erp.git

diff --git a/SL/Layout/Base.pm b/SL/Layout/Base.pm
index c470a05b6..e39502f1f 100644
--- a/SL/Layout/Base.pm
+++ b/SL/Layout/Base.pm
@@ -29,9 +29,7 @@ sub new {
 }
 
 sub init_menu {
-  my @menu_files = qw(menus/erp.ini);
-  unshift @menu_files, 'menus/crm.ini' if $::instance_conf->crm_installed;
-  Menu->new(@menu_files);
+  SL::Menu->new('user');
 }
 
 sub init_auto_reload_resources_param {
@@ -115,7 +113,6 @@ sub get_stylesheet_for_user {
   } else {
     $css_path = "$css_path/kivitendo";
   }
-  $::myconfig{css_path} = $css_path; # needed for menunew, FIXME: don't do this here
 
   return $css_path;
 }