Globale Variable $::menufile entfernt

diff --git a/SL/Dispatcher.pm b/SL/Dispatcher.pm
index 3624cecef4d7a8db49352f85defbef49d5df0d01..e0b163a50a4187b375e5318c61ba63d2c1579a17 100644 (file)
--- a/SL/Dispatcher.pm
+++ b/SL/Dispatcher.pm
@@ -88,7 +88,6 @@ sub pre_startup_setup {
   # canonial globals. if it's not here, chances are it will get refactored someday.
   {
     no warnings 'once';
-    $::menufile    = "menu.ini";
     $::lxdebug     = LXDebug->new;
     $::auth        = SL::Auth->new;
     $::form        = undef;

diff --git a/bin/mozilla/menu.pl b/bin/mozilla/menu.pl
index 36bdadc3f1e50df8a8aee202f6891facc1fc714c..cd0ca0d913a17bbadd32f1b1be8dc5d922792826 100644 (file)
--- a/bin/mozilla/menu.pl
+++ b/bin/mozilla/menu.pl
@@ -82,7 +82,7 @@ sub acc_menu {
   $::lxdebug->enter_sub;
 
   my $framesize    = _calc_framesize() - 2;
-  my $menu         = Menu->new($::menufile);
+  my $menu         = Menu->new("menu.ini");
   $mainlevel       = $::form->{level};
   $::form->{title} = $::locale->text('Lx-Office');
   $::form->header;

diff --git a/bin/mozilla/menuXML.pl b/bin/mozilla/menuXML.pl
index 2e7de670ac8a2b5f909c50532f9cdcf9d589ca64..1eed4edeb9e716a3e16b44042445aec0da26139f 100644 (file)
--- a/bin/mozilla/menuXML.pl
+++ b/bin/mozilla/menuXML.pl
@@ -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;
 

diff --git a/bin/mozilla/menujs.pl b/bin/mozilla/menujs.pl
index 3ab3cf738b7ee32be0ca9556dc5be3d086bf825a..54637216c00b0c30748e41159472dfcfc3857dbe 100644 (file)
--- a/bin/mozilla/menujs.pl
+++ b/bin/mozilla/menujs.pl
@@ -136,7 +136,7 @@ sub acc_menu {
 
   my $mainlevel = $form->{level};
   $mainlevel =~ s/$mainlevel--//g;
-  my $menu = Menu->new($::menufile);
+  my $menu = Menu->new("menu.ini");
 
   $| = 1;
 

diff --git a/bin/mozilla/menuv3.pl b/bin/mozilla/menuv3.pl
index e35a51e078c646c9f1a13f15987aed1c08591ec5..d444b759efb55dc720987e75ec091e6650c2d3a0 100644 (file)
--- a/bin/mozilla/menuv3.pl
+++ b/bin/mozilla/menuv3.pl
@@ -85,7 +85,7 @@ sub acc_menu {
 
   my $mainlevel = $form->{level};
   $mainlevel =~ s/\Q$mainlevel\E--//g;
-  my $menu = Menu->new($::menufile);
+  my $menu = Menu->new("menu.ini");
 
   $| = 1;
 

diff --git a/bin/mozilla/menuv4.pl b/bin/mozilla/menuv4.pl
index 56d734728e44e42ddbb606dab5bcc066b65a7e15..ae82d45f817f0e25f2d26e403431803d7b6af367 100644 (file)
--- a/bin/mozilla/menuv4.pl
+++ b/bin/mozilla/menuv4.pl
@@ -87,7 +87,7 @@ sub acc_menu {
 
   my $mainlevel = $form->{level};
   $mainlevel =~ s/\Q$mainlevel\E--//g;
-  my $menu = Menu->new($::menufile);
+  my $menu = Menu->new("menu.ini");
 
   $| = 1;