From c13acbec41af2e85ad469d36d1eec19343b7d680 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Sven=20Sch=C3=B6ling?= <s.schoeling@linet-services.de>
Date: Fri, 14 Oct 2011 10:24:42 +0200
Subject: [PATCH] ::called_subs ersatzlos gestrichen.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

call_sub Rekursionen sind nicht mehr aufgetreten seit das System eingebaut
wurde, kein Grund auf Verdacht darauf zu prüfen.
---
 SL/Dispatcher.pm      | 2 --
 bin/mozilla/common.pl | 4 ----
 t/structure/globals.t | 2 +-
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/SL/Dispatcher.pm b/SL/Dispatcher.pm
index 97a2f45f4..291953b77 100644
--- a/SL/Dispatcher.pm
+++ b/SL/Dispatcher.pm
@@ -95,7 +95,6 @@ sub pre_startup_setup {
     $::auth        = SL::Auth->new;
     $::form        = undef;
     %::myconfig    = ();
-    %::called_subs = (); # currently used for recursion detection
   }
 
   $SIG{__WARN__} = sub {
@@ -171,7 +170,6 @@ sub handle_request {
   $::cgi           = CGI->new('');
   $::locale        = Locale->new($::lx_office_conf{system}->{language});
   $::form          = Form->new;
-  %::called_subs   = ();
   $::instance_conf = SL::InstanceConfiguration->new;
 
   my $session_result = $::auth->restore_session;
diff --git a/bin/mozilla/common.pl b/bin/mozilla/common.pl
index dfa7d0f78..1b054cf22 100644
--- a/bin/mozilla/common.pl
+++ b/bin/mozilla/common.pl
@@ -9,7 +9,6 @@
 #
 ######################################################################
 
-use Carp;
 use SL::Common;
 use SL::DB::Helper::Mappings;
 use SL::DBUtils;
@@ -440,9 +439,6 @@ sub call_sub {
     $form->error(sprintf($locale->text("Attempt to call an undefined sub named '%s'"), $name));
   }
 
-  $::called_subs{$name}++;
-  confess "RECURSION DETECTION: call_sub($name) called " . $::called_subs{$name} . " time(s)" if $::called_subs{$name} > 10;
-
   {
     no strict "refs";
     &{ $name }(@_);
diff --git a/t/structure/globals.t b/t/structure/globals.t
index 7b5aa06d3..232dca685 100644
--- a/t/structure/globals.t
+++ b/t/structure/globals.t
@@ -7,7 +7,7 @@ use Support::Files;
 my (@globals, $testcount);
 
 BEGIN {
-  @globals = qw(lxdebug auth myconfig form cgi lx_office_conf locale called_subs dispatcher instance_conf);
+  @globals = qw(lxdebug auth myconfig form cgi lx_office_conf locale dispatcher instance_conf);
   $testcount = scalar(@Support::Files::testitems);
 }
 
-- 
2.20.1