From: Sven Schöling <s.schoeling@linet-services.de>
Date: Mon, 20 Sep 2010 13:27:53 +0000 (+0200)
Subject: Merge branch 'master' of ssh://lx-office/~/lx-office-erp
X-Git-Tag: release-2.6.2beta1~127^2~2
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/7148af2b3319bebf9a00e0463fe46a60941c4714?hp=514439bd8e9e969eceb0cca472143e5bc24e2198

Merge branch 'master' of ssh://lx-office/~/lx-office-erp
---

diff --git a/SL/Dispatcher.pm b/SL/Dispatcher.pm
index 2c0539bb8..8bd296804 100644
--- a/SL/Dispatcher.pm
+++ b/SL/Dispatcher.pm
@@ -130,13 +130,9 @@ sub handle_request {
   my $interface = lc(shift || 'cgi');
   my ($script_name, $action);
 
-  if ($interface =~ m/^(?:fastcgi|fcgid|fcgi)$/) {
-    $script_name = $ENV{SCRIPT_NAME};
-    unrequire_bin_mozilla();
+  $script_name = $ENV{SCRIPT_NAME};
 
-  } else {
-    $script_name = $0;
-  }
+  unrequire_bin_mozilla($interface);
 
   $::cgi         = CGI->new('');
   $::locale      = Locale->new($::language);
@@ -205,6 +201,8 @@ sub handle_request {
 }
 
 sub unrequire_bin_mozilla {
+  return unless $_[0] =~ m/^(?:fastcgi|fcgid|fcgi)$/;
+
   for (keys %INC) {
     next unless m#^bin/mozilla/#;
     next if /\bcommon.pl$/;