From b069a8db461a423efbe07190c326ce89ddbf3e20 Mon Sep 17 00:00:00 2001
From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Wed, 19 Jan 2011 16:19:38 +0100
Subject: [PATCH] =?utf8?q?Gesamte=20%::lx=5Foffice=5Fconf=20als=20Objekt?=
 =?utf8?q?=20an=20Controller-basierte=20Templates=20=C3=BCbergeben?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 SL/Controller/Base.pm | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/SL/Controller/Base.pm b/SL/Controller/Base.pm
index 8135b5558..fff11ca3a 100644
--- a/SL/Controller/Base.pm
+++ b/SL/Controller/Base.pm
@@ -67,14 +67,7 @@ sub render {
                  AUTH     => $::auth,
                  FORM     => $::form,
                  LOCALE   => $::locale,
-                 LXCONFIG => { dbcharset              => $::lx_office_conf{system}->{dbcharset},
-                               webdav                 => $::lx_office_conf{system}->{webdav},
-                               lizenzen               => $::lx_office_conf{system}->{lizenzen},
-                               latex_templates        => $::lx_office_conf{print_templates}->{latex},
-                               opendocument_templates => $::lx_office_conf{print_templates}->{opendocument},
-                               vertreter              => $::lx_office_conf{system}->{vertreter},
-                               show_best_before       => $::lx_office_conf{system}->{show_best_before},
-                             },
+                 LXCONFIG => \%::lx_office_conf,
                  LXDEBUG  => $::lxdebug,
                  MYCONFIG => \%::myconfig,
                  SELF     => $self,
@@ -336,9 +329,10 @@ The template itself has access to the following variables:
 
 =item * C<LOCALE> -- C<$::locale>
 
-=item * C<LXCONFIG> -- all parameters from C<config/lx-erp.conf> with
-the same name they appear in the file (e.g. C<dbcharset>, C<webdav>
-etc)
+=item * C<LXCONFIG> -- all parameters from C<config/lx_office.conf>
+with the same name they appear in the file (first level is the
+section, second the actual variable, e.g. C<system.dbcharset>,
+C<features.webdav> etc)
 
 =item * C<LXDEBUG> -- C<$::lxdebug>
 
-- 
2.20.1