Form: globals nicht mehr beim Drucken in Form ablegen

diff --git a/SL/Form.pm b/SL/Form.pm
index 266d3e5eac26fcf79b966409d9b4430c2608da20..9669b1aaa50e95f6a2cf11a7ac74926f34dab3cc 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -586,17 +586,6 @@ sub set_standard_title {
   $::lxdebug->leave_sub;
 }
 
   $::lxdebug->leave_sub;
 }
 

-sub prepare_global_vars {
-  my ($self) = @_;
-
-  $self->{AUTH}            = $::auth;
-  $self->{INSTANCE_CONF}   = $::instance_conf;
-  $self->{LOCALE}          = $::locale;
-  $self->{LXCONFIG}        = $::lx_office_conf;
-  $self->{LXDEBUG}         = $::lxdebug;
-  $self->{MYCONFIG}        = \%::myconfig;
-}
-

 sub _prepare_html_template {
   $main::lxdebug->enter_sub();
 
 sub _prepare_html_template {
   $main::lxdebug->enter_sub();
 

diff --git a/SL/Template/LaTeX.pm b/SL/Template/LaTeX.pm
index 8a579ef46f3a9f883e23bb237238f5edad5b5046..f5062ba838715e5ad3d15b1eb88740a08d13a738 100644 (file)
--- a/SL/Template/LaTeX.pm
+++ b/SL/Template/LaTeX.pm
@@ -448,9 +448,9 @@ sub parse {
       $contents = "[% TAGS $self->{tag_start} $self->{tag_end} %]\n" . $contents;
     }
 
       $contents = "[% TAGS $self->{tag_start} $self->{tag_end} %]\n" . $contents;
     }
 

-    $form->prepare_global_vars;
+    my $globals = global_vars();

 
 

-    $::form->init_template->process(\$contents, $form, \$new_contents) || die $::form->template->error;
+    $::form->init_template->process(\$contents, { %$form, %$globals }, \$new_contents) || die $::form->template->error;

   } else {
     $new_contents = $self->parse_block($contents);
   }
   } else {
     $new_contents = $self->parse_block($contents);
   }


@@ -637,4 +637,15 @@ sub parse_and_create_pdf {
   return (file_name => do { $tex_file_name =~ s/tex$/pdf/; $tex_file_name });
 }
 
   return (file_name => do { $tex_file_name =~ s/tex$/pdf/; $tex_file_name });
 }
 

+sub global_vars {
+  {
+    AUTH            => $::auth,
+    INSTANCE_CONF   => $::instance_conf,
+    LOCALE          => $::locale,
+    LXCONFIG        => $::lx_office_conf,
+    LXDEBUG         => $::lxdebug,
+    MYCONFIG        => \%::myconfig,
+  };
+}
+

 1;
 1;