as2252258/kiri-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Mr·x
2021-04-29 10:35:17 +08:00
parent 793cfa4266 7ea6f7b6a0
commit b62adcd9dd
2 changed files with 1013 additions and 1013 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Database/Base/BaseActiveRecord.php
+1012 -1012
View File
File diff suppressed because it is too large Load Diff
Database/Mysql/Columns.php
+1 -1
View File
@@ -112,7 +112,7 @@ class Columns extends Component
*/ */
public function decode($val, $format = null): mixed public function decode($val, $format = null): mixed
{ {
if (empty($format)) { if (empty($format) || $val === null) {
return $val; return $val;
} }
$format = strtolower($format); $format = strtolower($format);