X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FTemplate%2FLaTeX.pm;h=2f99f7e180a8b8c89849a52011b040fa3c26990a;hb=db3b23aa8ab6baaa3854259b59b033fbd23541ad;hp=291eb9f0ff9b484100f7dbc2ba73cfeafd811571;hpb=a23454bb1b039a31b7f77710ff663fa9152d530c;p=kivitendo-erp.git

diff --git a/SL/Template/LaTeX.pm b/SL/Template/LaTeX.pm
index 291eb9f0f..2f99f7e18 100644
--- a/SL/Template/LaTeX.pm
+++ b/SL/Template/LaTeX.pm
@@ -12,6 +12,8 @@ use File::Temp;
 use List::MoreUtils qw(any);
 use Unicode::Normalize qw();
 
+use SL::DB::Default;
+
 sub new {
   my $type = shift;
 
@@ -336,7 +338,7 @@ sub parse {
     $self->{"error"} = "$form->{templates}/$form->{IN}: $!";
     return 0;
   }
-  binmode IN, ":utf8" if $::locale->is_utf8;
+  binmode IN, ":utf8";
   my @lines = <IN>;
   close(IN);
 
@@ -372,13 +374,8 @@ sub parse {
     return 0;
   }
 
-  if ($::locale->is_utf8) {
-    binmode OUT, ":utf8";
-    print OUT Unicode::Normalize::normalize('C', $new_contents);
-
-  } else {
-    print OUT $new_contents;
-  }
+  binmode OUT, ":utf8";
+  print OUT Unicode::Normalize::normalize('C', $new_contents);
 
   if ($form->{"format"} =~ /postscript/i) {
     return $self->convert_to_postscript();
@@ -516,7 +513,7 @@ sub parse_and_create_pdf {
   $local_form->{IN}        = $template_file_name;
   $local_form->{tmpdir}    = $::lx_office_conf{paths}->{userspath};
   $local_form->{tmpfile}   = $tex_file_name;
-  $local_form->{templates} = $::myconfig{templates};
+  $local_form->{templates} = SL::DB::Default->get->templates;
 
   foreach (keys %params) {
     croak "The parameter '$_' must not be used." if exists $local_form->{$_};