Consider colspan attributes when adding table cells/rows

1 files 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();
         }
     }