Mercurial > hg > rc2
comparison program/lib/Roundcube/html.php @ 11:aff04b06b685 default tip
various small fixes from upgrades to PHP and/or hangover from fix to apt-get overwrite at beginning of the year somehow
author | Charlie Root |
---|---|
date | Sun, 26 Jan 2025 13:09:03 -0500 |
parents | 4681f974d28b |
children |
comparison
equal
deleted
inserted
replaced
10:8e3cc6fc791d | 11:aff04b06b685 |
---|---|
749 | 749 |
750 $cell = new stdClass; | 750 $cell = new stdClass; |
751 $cell->attrib = $attr; | 751 $cell->attrib = $attr; |
752 $cell->content = $cont; | 752 $cell->content = $cont; |
753 | 753 |
754 $this->rows[$this->rowindex]->cells[$this->colindex] = $cell; | 754 // make sure row object exists (#1489094) |
755 if (!$this->rows[$this->rowindex]) { | |
756 $this->rows[$this->rowindex] = new stdClass; | |
757 } | |
758 | |
759 $this->rows[$this->rowindex]->cells[$this->colindex] = $cell; | |
755 $this->colindex += max(1, intval($attr['colspan'])); | 760 $this->colindex += max(1, intval($attr['colspan'])); |
756 | 761 |
757 if ($this->attrib['cols'] && $this->colindex >= $this->attrib['cols']) { | 762 if ($this->attrib['cols'] && $this->colindex >= $this->attrib['cols']) { |
758 $this->add_row(); | 763 $this->add_row(); |
759 } | 764 } |