modifs.mineures sans commentaires
This commit is contained in:
parent
7aa2ad4a73
commit
191f6c4523
|
@ -351,7 +351,8 @@ class CTable extends ComponentPrintable implements IParametrable {
|
|||
|
||||
protected function ensureArray($row): array {
|
||||
if (!is_array($row)) {
|
||||
if ($row instanceof BaseArray) $row = $row->array();
|
||||
if ($row === null) $row = [];
|
||||
elseif ($row instanceof BaseArray) $row = $row->array();
|
||||
elseif ($row instanceof Iterator) $row = iterator_to_array($row);
|
||||
else throw ValueException::unexpected_type("array", $row);
|
||||
}
|
||||
|
@ -450,7 +451,7 @@ class CTable extends ComponentPrintable implements IParametrable {
|
|||
$this->rowIndex = 0;
|
||||
$haveRows = false;
|
||||
while ($this->_validRow()) {
|
||||
$this->rawRow = $this->_currentRow($this->rowKey);;
|
||||
$this->rawRow = $this->_currentRow($this->rowKey);
|
||||
try {
|
||||
$this->origRow = $this->nextRow();
|
||||
if ($this->origRow === null) continue;
|
||||
|
|
|
@ -34,8 +34,9 @@ class CVerticalTable extends CTable {
|
|||
$this->rowIndex = 0;
|
||||
$haveRows = false;
|
||||
while ($this->_validRow()) {
|
||||
$this->origRow = $this->nextRow();
|
||||
$this->rawRow = $this->_currentRow($this->rowKey);
|
||||
try {
|
||||
$this->origRow = $this->nextRow();
|
||||
if ($this->origRow === null) continue;
|
||||
|
||||
$skipRow = false;
|
||||
|
|
Loading…
Reference in New Issue