From: Stephan Köhler <s.koehler@linet-services.de>
Date: Sat, 26 Nov 2005 14:54:17 +0000 (+0000)
Subject: Merge von 630 aus unstable: Fehler: <pagebreak> in Variablen funktionierte aufgrund
X-Git-Tag: release-2.2.0~88
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=7e0b89ccfe26396fec60424bf9d1dc94d04e6970;p=kivitendo-erp.git

Merge von 630 aus unstable: Fehler: <pagebreak> in Variablen funktionierte aufgrund
falscher Arrayinitialisierung nur einmal pro Formular. Drei Zeilen Debug-Code entfernt.
---

diff --git a/SL/Form.pm b/SL/Form.pm
index 215083830..0573ed9d0 100644
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -1030,7 +1030,7 @@ sub format_string {
     next unless ($self->{$field} =~ /\<pagebreak\>/);
     $self->{$field} =~ s/\<pagebreak\>//g;
     if ($field =~ /.*_(\d+)$/) {
-      if ($self->{"_forced_pagebreaks"}) {
+      if (!$self->{"_forced_pagebreaks"}) {
         $self->{"_forced_pagebreaks"} = [];
       }
       push(@{ $self->{"_forced_pagebreaks"} }, "$1");
@@ -1100,9 +1100,6 @@ sub format_string {
                           'u' => 'underline');
 
     foreach my $field (@fields) {
-      if ($field =~ /descrip/) {
-        print(STDERR "QFT: ${field}: " . $self->{$field} . "\n");
-      }
       foreach my $key (keys(%markup_replace)) {
         my $new = $markup_replace{$key};
         $self->{$field} =~