From: Sven Schöling <s.schoeling@linet-services.de>
Date: Mon, 19 Sep 2011 15:34:10 +0000 (+0200)
Subject: %::debug_options => $::lx_office_conf->{debug}->{options}
X-Git-Tag: release-2.7.0beta1~277
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=1b3ad7949687a373d832e0447f772e86363525f5;p=kivitendo-erp.git

%::debug_options => $::lx_office_conf->{debug}->{options}

Globale Hashes sind mit der jetzigen Konfiguration eh nicht schreibbar (zum
Glück) und der Standard benutzt das eh nicht. Wenn also einer das braucht,
bitte das benutzen.
---

diff --git a/SL/Form.pm b/SL/Form.pm
index 024cd96d8..f313999c3 100644
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -846,8 +846,8 @@ sub _prepare_html_template {
   $additional_params->{"conf_payments_changeable"}    = $::lx_office_conf{features}->{payments_changeable};
   $additional_params->{"INSTANCE_CONF"}               = $::instance_conf;
 
-  if (%main::debug_options) {
-    map { $additional_params->{'DEBUG_' . uc($_)} = $main::debug_options{$_} } keys %main::debug_options;
+  if (my $debug_options = $::lx_office_conf{debug}{options}) {
+    map { $additional_params->{'DEBUG_' . uc($_)} = $debug_options->{$_} } keys %$debug_options;
   }
 
   if ($main::auth && $main::auth->{RIGHTS} && $main::auth->{RIGHTS}->{$self->{login}}) {