Mercurial > hg > rc2

comparison program/lib/Roundcube/html.php @ 22:303b85d5b561

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More cleaning up php8 Warnings/deprecations
author Charlie Root
date Wed, 15 Oct 2025 14:06:27 -0400
parents 73124dd49283
children c32b53434b47
comparison
equal deleted inserted replaced
21:73124dd49283 22:303b85d5b561
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 // make sure row object exists (#1489094) 754 // make sure row object exists (#1489094)
755 if (!$this->rows[$this->rowindex]) { 755 if (empty($this->rows[$this->rowindex])) {
756 $this->rows[$this->rowindex] = new stdClass; 756 $this->rows[$this->rowindex] = new stdClass;
757 } 757 }
758 758
759 $this->rows[$this->rowindex]->cells[$this->colindex] = $cell; 759 $this->rows[$this->rowindex]->cells[$this->colindex] = $cell;
760 $this->colindex += max(1, intval($attr['colspan']??null)); 760 $this->colindex += max(1, intval($attr['colspan']??null));
893 foreach ($row->cells as $c => $col) { 893 foreach ($row->cells as $c => $col) {
894 $rowcontent .= self::tag($this->_col_tagname(), $col->attrib, $col->content); 894 $rowcontent .= self::tag($this->_col_tagname(), $col->attrib, $col->content);
895 } 895 }
896 896
897 if ($r < $this->rowindex || count($row->cells)) { 897 if ($r < $this->rowindex || count($row->cells)) {
898 $tbody .= self::tag($this->_row_tagname(), $row->attrib, $rowcontent, parent::$common_attrib); 898 $tbody .= self::tag($this->_row_tagname(), $row->attrib??null, $rowcontent, parent::$common_attrib);
899 } 899 }
900 } 900 }
901 901
902 if ($this->attrib['rowsonly']??null) { 902 if ($this->attrib['rowsonly']??null) {
903 return $tbody; 903 return $tbody;