From 3ca14dd3269b9629d2fe9bbb3bcc78faa6b8a5fa Mon Sep 17 00:00:00 2001 From: Chris Nighswonger Date: Mon, 14 Mar 2011 16:27:17 -0400 Subject: [PATCH] Bug 5865 - Labels wrap incorrectly when paper width is greater than height This is due to the incorrect use of string comparators to compare numeric values. This patch corrects that. Note: This should be backported to 3.2.x Signed-off-by: Jared Camins-Esakov Signed-off-by: Chris Cormack (cherry picked from commit 5a924cc530658f3ab11cf1a219fd9ba4e602f1e5) Signed-off-by: Chris Nighswonger --- labels/label-create-pdf.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/labels/label-create-pdf.pl b/labels/label-create-pdf.pl index 11087268af..608be0401a 100755 --- a/labels/label-create-pdf.pl +++ b/labels/label-create-pdf.pl @@ -33,13 +33,13 @@ my $layout = C4::Labels::Layout->retrieve(layout_id => $layout_id); sub _calc_next_label_pos { my ($row_count, $col_count, $llx, $lly) = @_; - if ($col_count lt $template->get_attr('cols')) { + if ($col_count < $template->get_attr('cols')) { $llx = ($llx + $template->get_attr('label_width') + $template->get_attr('col_gap')); $col_count++; } else { $llx = $template->get_attr('left_margin'); - if ($row_count eq $template->get_attr('rows')) { + if ($row_count == $template->get_attr('rows')) { $pdf->Page(); $lly = ($template->get_attr('page_height') - $template->get_attr('top_margin') - $template->get_attr('label_height')); $row_count = 1; -- 2.39.5