Skip to content

Commit

Permalink
Merge branch '2024.11'
Browse files Browse the repository at this point in the history
  • Loading branch information
gitlabci committed Jan 27, 2025
2 parents a6ee536 + bae1750 commit a101bde
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion tine20/Tinebase/Controller/Record/Abstract.php
Original file line number Diff line number Diff line change
Expand Up @@ -3503,7 +3503,8 @@ protected function _updateDependentRecords(Tinebase_Record_Interface $_record, /
$_record->{$_property} = $rs;
}

if (! empty($_record->{$_property}) && $_record->{$_property} && $_record->{$_property}->count() > 0) {
if (! empty($_record->{$_property}) && $_record->{$_property} && ! is_scalar($_record->{$_property})
&& $_record->{$_property}->count() > 0) {
if (isset($_fieldConfig[TMCC::FORCE_VALUES])) {
foreach ($_fieldConfig[TMCC::FORCE_VALUES] as $prop => $val) {
$_record->{$_property}->{$prop} = $val;
Expand Down

0 comments on commit a101bde

Please sign in to comment.