diff options
| author | Jan-Hendrik Willms <tleilax+studip@gmail.com> | 2022-10-26 10:10:25 +0000 |
|---|---|---|
| committer | Jan-Hendrik Willms <tleilax+studip@gmail.com> | 2022-10-26 10:10:25 +0000 |
| commit | b8256a4732c53ca504bb8c17adcb47cfa799d81e (patch) | |
| tree | 6e3febf53f7fba7fccedf55200a83777806b3c10 /lib/models/DatafieldEntryModel.class.php | |
| parent | 872ca0df6a7eae23f9219b725511b17213e7672a (diff) | |
prevent more php8 warnings, fixes #1679 (again)
Closes #1679
Merge request studip/studip!1097
Diffstat (limited to 'lib/models/DatafieldEntryModel.class.php')
| -rw-r--r-- | lib/models/DatafieldEntryModel.class.php | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/lib/models/DatafieldEntryModel.class.php b/lib/models/DatafieldEntryModel.class.php index 0ae03c4..cea65ef 100644 --- a/lib/models/DatafieldEntryModel.class.php +++ b/lib/models/DatafieldEntryModel.class.php @@ -50,6 +50,7 @@ class DatafieldEntryModel extends SimpleORMap implements PrivacyObject { $mask = ["user" => 1, "autor" => 2, "tutor" => 4, "dozent" => 8, "admin" => 16, "root" => 32]; + $sec_range_id = null; if (is_a($model, "Course")) { $params[':institution_ids'] = $model->institutes->pluck('institut_id'); $object_class = SeminarCategories::GetByTypeId($model->status)->id; @@ -85,13 +86,11 @@ class DatafieldEntryModel extends SimpleORMap implements PrivacyObject $object_class = $model->getVariant(); $object_type = 'moduldeskriptor'; $range_id = $model->deskriptor_id; - $sec_range_id = null; } elseif (is_a($model, 'ModulteilDeskriptor')) { $params[':institution_ids'] = [$model->modulteil->modul->responsible_institute->institut_id]; $object_class = $model->getVariant(); $object_type = 'modulteildeskriptor'; $range_id = $model->deskriptor_id; - $sec_range_id = null; } elseif ($model instanceof StatusgruppeUser) { if (isset($model->group->institute)) { $params[':institution_ids'] = [$model->group->institute->id]; @@ -107,7 +106,6 @@ class DatafieldEntryModel extends SimpleORMap implements PrivacyObject $object_class = $model->getVariant(); $object_type = 'studycourse'; $range_id = $model->studiengang_id; - $sec_range_id = null; } if (!$object_type) { @@ -144,7 +142,7 @@ class DatafieldEntryModel extends SimpleORMap implements PrivacyObject $query .= "AND ((object_class & :object_class) OR object_class IS NULL) $one_datafield ORDER BY priority"; $params = array_merge($params, [ ':range_id' => (string) $range_id, - ':sec_range_id' => (string) ($sec_range_id ?? ''), + ':sec_range_id' => (string) $sec_range_id, ':object_type' => $object_type, ':object_class' => (int) $object_class]); } @@ -161,12 +159,11 @@ class DatafieldEntryModel extends SimpleORMap implements PrivacyObject $ret[$c] = clone $df_entry; } else { $ret[$c] = clone $df_entry_i18n; - $row['content'] = I18NStringDatafield::load( - [ - $row['datafield_id'], - $range_id, - (string) $sec_range_id - ]); + $row['content'] = I18NStringDatafield::load([ + $row['datafield_id'], + $range_id, + (string) $sec_range_id + ]); } $ret[$c]->setData($row, true); if (!$row['isset_content']) { |