From d29b02386a1406ec5dbaddbdbf40c4df6bc3070b Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Wed, 19 Jan 2011 16:17:44 +0100 Subject: [PATCH] Globale Variable $::menufile entfernt --- SL/Dispatcher.pm | 1 - bin/mozilla/menu.pl | 2 +- bin/mozilla/menuXML.pl | 2 +- bin/mozilla/menujs.pl | 2 +- bin/mozilla/menuv3.pl | 2 +- bin/mozilla/menuv4.pl | 2 +- 6 files changed, 5 insertions(+), 6 deletions(-) diff --git a/SL/Dispatcher.pm b/SL/Dispatcher.pm index 3624cecef..e0b163a50 100644 --- 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 36bdadc3f..cd0ca0d91 100644 --- 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 2e7de670a..1eed4edeb 100644 --- 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 3ab3cf738..54637216c 100644 --- 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 e35a51e07..d444b759e 100644 --- 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 56d734728..ae82d45f8 100644 --- 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; -- 2.20.1