Consider colspan attributes when adding table cells/rows

12 years ago · ae44bf4dc7
parent 7f64d7c2e4
commit ae44bf4dc7
1 changed files with 2 additions and 2 deletions
--- 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();
        }
    }