From: Sven Schöling <s.schoeling@linet-services.de>
Date: Tue, 11 Sep 2012 15:22:52 +0000 (+0200)
Subject: Revert "Menu Instance als Singleton cachen."
X-Git-Tag: release-3.0.0beta1~183
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=075f1eabc2cddbc71367a4b9746cb610ec08705f;p=kivitendo-erp.git

Revert "Menu Instance als Singleton cachen."

This reverts commit b76380d4aaab32fd83ba5cfc7e071455093192e1.

Conflicts:

	SL/Menu.pm
---

diff --git a/SL/Menu.pm b/SL/Menu.pm
index eac4e2fe6..3b994f2fb 100644
--- a/SL/Menu.pm
+++ b/SL/Menu.pm
@@ -39,18 +39,11 @@ use SL::Inifile;
 
 use strict;
 
-my $instance;
-
 sub new {
   $main::lxdebug->enter_sub();
 
   my ($type, $menufile) = @_;
 
-  if ($instance) {
-    $::lxdebug->leave_sub;
-    return $instance;
-  }
-
   my $self    = {};
   my $inifile = Inifile->new($menufile);
 
@@ -62,7 +55,7 @@ sub new {
 
   $main::lxdebug->leave_sub();
 
-  return $instance = $self;
+  return $self;
 }
 
 sub menuitem_js {