From ba863fd67776403dcf9de6b1141509a48a4b7204 Mon Sep 17 00:00:00 2001
From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Fri, 11 May 2007 11:42:54 +0000
Subject: [PATCH] =?utf8?q?Filehandles=20als=20lokal=20deklarieren;=20Kosme?=
 =?utf8?q?tik;=20Argumente=20f=C3=BCr=20open()=20nicht=20aus=20$form=20erz?=
 =?utf8?q?eugen.=20Das=20Feature,=20dass=20f=C3=BCr=20jede=20Person=20eine?=
 =?utf8?q?=20eigene=20menu.ini=20eingelesen=20wird,=20wird=20hoffentlich?=
 =?utf8?q?=20nie=20jemand=20eingesetzt=20haben.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 SL/Inifile.pm          | 2 ++
 bin/mozilla/menu.pl    | 3 ---
 bin/mozilla/menunew.pl | 3 ---
 bin/mozilla/menuv3.pl  | 3 ---
 4 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/SL/Inifile.pm b/SL/Inifile.pm
index 8ec3e80bd..eae4f49e4 100644
--- a/SL/Inifile.pm
+++ b/SL/Inifile.pm
@@ -43,6 +43,8 @@ sub new {
   my $id = "";
   my $skip;
 
+  local *FH;
+
   $type = ref($self) || $self;
 
   open FH, "$file" or Form->error("$file : $!");
diff --git a/bin/mozilla/menu.pl b/bin/mozilla/menu.pl
index 3da92a906..fe2c731da 100644
--- a/bin/mozilla/menu.pl
+++ b/bin/mozilla/menu.pl
@@ -72,9 +72,6 @@ sub acc_menu {
   $mainlevel = $form->{level};
   $mainlevel =~ s/$mainlevel--//g;
   my $menu = new Menu "$menufile";
-  $menu = new Menu "custom_$menufile" if (-f "custom_$menufile");
-  $menu = new Menu "$form->{login}_$menufile"
-    if (-f "$form->{login}_$menufile");
 
   $form->{title} = $locale->text('Accounting Menu');
 
diff --git a/bin/mozilla/menunew.pl b/bin/mozilla/menunew.pl
index b0b46e8c3..be6522181 100644
--- a/bin/mozilla/menunew.pl
+++ b/bin/mozilla/menunew.pl
@@ -126,9 +126,6 @@ sub acc_menu {
   $mainlevel = $form->{level};
   $mainlevel =~ s/$mainlevel--//g;
   my $menu = new Menu "$menufile";
-  $menu = new Menu "custom_$menufile" if (-f "custom_$menufile");
-  $menu = new Menu "$form->{login}_$menufile"
-    if (-f "$form->{login}_$menufile");
 
   $| = 1;
 
diff --git a/bin/mozilla/menuv3.pl b/bin/mozilla/menuv3.pl
index c9a3d541d..4ad56bd5e 100644
--- a/bin/mozilla/menuv3.pl
+++ b/bin/mozilla/menuv3.pl
@@ -133,9 +133,6 @@ sub acc_menu {
   $mainlevel = $form->{level};
   $mainlevel =~ s/$mainlevel--//g;
   my $menu = new Menu "$menufile";
-  $menu = new Menu "custom_$menufile" if (-f "custom_$menufile");
-  $menu = new Menu "$form->{login}_$menufile"
-    if (-f "$form->{login}_$menufile");
 
   $| = 1;
 
-- 
2.20.1