The colspan parameter in row_text now doesn't add an extra <td> but simply expands...

diff --git a/dev/changes.txt b/dev/changes.txt
index 2edb1069dff0fb5e27395b24b4f62350d04b5b78..4be5264a0e83810dce53c96fd80176a259642bc1 100644 (file)
--- a/dev/changes.txt
+++ b/dev/changes.txt
@@ -7,6 +7,7 @@
 - Added a parameter in Mail->send() to optionally clear the to list after sending [mail.php]
 - Added a parameter in API->delete() to optionally stop the running of API->set_existing() [api.php]
 - Changed some of the API error messages to reflect what actually caused the error [api.php]
+- Made the Printer->row_text() colspan parameter work more normally [printer.php]
 
 2.0.0
 ===============

diff --git a/printer.php b/printer.php
index 97b2e19cacfe02805f81fb06ca279d26e187ca3e..355e7d93e78c8174cf1dbcd797e54da39ad05d21 100644 (file)
--- a/printer.php
+++ b/printer.php
@@ -729,12 +729,7 @@ JS;
                
                echo "<tr valign=\"$valign\">";
                echo "\n\t<td class=\"$row_class\">$label</td>";
-               echo "\n\t<td class=\"$row_class\">$value</td>";
-               
-               if ($colspan > 2)
-               {
-                       echo "\n\t<td class=\"$row_class\" colspan=\"" . $colspan - 2 . "\">&nbsp;</td>";
-               }
+               echo "\n\t<td class=\"$row_class\" colspan=\"" . ($colspan - 1) . "\">$value</td>";
                
                echo "\n</tr>\n";
        }