From ae44bf4dc76dcc686907d99c8ff208bf952b9ff6 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(-) (limited to 'program/include') diff --git a/program/include/html.php b/program/include/html.php index 948794283..234985241 100644 --- a/program/include/html.php +++ b/program/include/html.php @@ -681,9 +681,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