malhuda/CodeIgniter4
1
0
Fork 0
mirror of https://github.com/codeigniter4/CodeIgniter4.git synced 2025-02-20 11:44:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: TypeError when Time is passed to Model

Browse Source
This commit is contained in:
kenjis 2024-04-09 13:44:03 +09:00
parent 2460fafbe8
commit edb87e8a45
No known key found for this signature in database
GPG Key ID: BD254878922AF198
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
system/BaseModel.php
View File

@ -926,6 +926,9 @@ abstract class BaseModel
$row = (array) $row;
}
// Convert any Time instances to appropriate $dateFormat
$row = $this->timeToString($row);
// Validate every row.
if (! $this->skipValidation && ! $this->validate($row)) {
// Restore $cleanValidationRules
@ -1845,8 +1848,6 @@ abstract class BaseModel
$row = $this->converter->toDataSource($row);
} elseif ($row instanceof Entity) {
$row = $this->converter->extract($row, $onlyChanged);
// Convert any Time instances to appropriate $dateFormat
$row = $this->timeToString($row);
} elseif (is_object($row)) {
$row = $this->converter->extract($row, $onlyChanged);
}
@ -1870,7 +1871,8 @@ abstract class BaseModel
throw DataException::forEmptyDataset($type);
}
return $row;
// Convert any Time instances to appropriate $dateFormat
return $this->timeToString($row);
}
/**