diff options
| author | Moritz Strohm <strohm@data-quest.de> | 2022-09-28 12:47:45 +0000 |
|---|---|---|
| committer | Moritz Strohm <strohm@data-quest.de> | 2022-09-28 12:47:45 +0000 |
| commit | 1e6f3d59c1989dc0da68d3200090cb4768ab3094 (patch) | |
| tree | 6b07aa6aca6595c5dfc0c2aa446b0fe2d8847ef1 /lib/models/resources | |
| parent | 9e13d2f5fa4726b54efe8ad046d0b53aadb543bf (diff) | |
fix for BIESt #1110
Merge request studip/studip!675
Diffstat (limited to 'lib/models/resources')
| -rw-r--r-- | lib/models/resources/Resource.class.php | 4 | ||||
| -rw-r--r-- | lib/models/resources/ResourceCategory.class.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/models/resources/Resource.class.php b/lib/models/resources/Resource.class.php index fa854a6..e66598d 100644 --- a/lib/models/resources/Resource.class.php +++ b/lib/models/resources/Resource.class.php @@ -1365,10 +1365,10 @@ class Resource extends SimpleORMap implements StudipItem continue; } $group_name = ''; - if ($property->definition->group->name) { + if (!empty($property->definition->group->name)) { $group_name = $property->definition->group->name; } - if (!is_array($property_groups[$group_name])) { + if (empty($property_groups[$group_name]) || !is_array($property_groups[$group_name])) { $property_groups[$group_name] = []; } $property_groups[$group_name][] = $property; diff --git a/lib/models/resources/ResourceCategory.class.php b/lib/models/resources/ResourceCategory.class.php index 9078373..9738cbc 100644 --- a/lib/models/resources/ResourceCategory.class.php +++ b/lib/models/resources/ResourceCategory.class.php @@ -210,7 +210,7 @@ class ResourceCategory extends SimpleORMap ]; $property_groups = []; foreach ($definitions as $definition) { - if ($definition->group->name) { + if ($definition->group && $definition->group->name) { $group_name = $definition->group->name; if (!is_array($property_groups[$group_name])) { $property_groups[$group_name] = []; |