From ef7a786b38d36374585be6b5800ce1862b40eb50 Mon Sep 17 00:00:00 2001 From: Thomas Bruederli Date: Thu, 4 Oct 2012 11:46:54 +0200 Subject: Consider colspan attributes when adding table cells/rows --- program/include/html.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/program/include/html.php b/program/include/html.php index dc93b3317..8d0996e1f 100644 --- a/program/include/html.php +++ b/program/include/html.php @@ -643,9 +643,9 @@ class html_table extends html $cell->content = $cont; $this->rows[$this->rowindex]->cells[$this->colindex] = $cell; - $this->colindex++; + $this->colindex += max(1, intval($attr['colspan'])); - if ($this->attrib['cols'] && $this->colindex == $this->attrib['cols']) { + if ($this->attrib['cols'] && $this->colindex >= $this->attrib['cols']) { $this->add_row(); } } -- cgit v1.2.3