diff options
| author | David Siegfried <david.siegfried@uni-vechta.de> | 2022-11-02 08:09:14 +0000 |
|---|---|---|
| committer | Jan-Hendrik Willms <tleilax+studip@gmail.com> | 2022-11-02 08:09:14 +0000 |
| commit | 1e9f2810615f7b375e3133a9f8fbdbc767513978 (patch) | |
| tree | ca60815c430c6d3378a96596b0eacef2f964d175 /lib/models/Folder.php | |
| parent | f71ee9305d044b982ae4d65e5c29671dc8b40d9e (diff) | |
prevent php8-warnings, refs #1733
Merge request studip/studip!1128
Diffstat (limited to 'lib/models/Folder.php')
| -rw-r--r-- | lib/models/Folder.php | 38 |
1 files changed, 22 insertions, 16 deletions
diff --git a/lib/models/Folder.php b/lib/models/Folder.php index fcf4d98..d1d778a 100644 --- a/lib/models/Folder.php +++ b/lib/models/Folder.php @@ -194,15 +194,18 @@ class Folder extends SimpleORMap implements FeedbackRange */ public static function findByTopic_id($topic_id) { - $seminar_id = CourseTopic::find($topic_id)->seminar_id; - $topic_folders = self::findBySQL( - "folder_type = 'CourseTopicFolder' AND range_id = ? AND range_type = 'course'", - [$seminar_id] - ); + $course_topic = CourseTopic::find($topic_id); $ret = []; - foreach ($topic_folders as $key => $folder) { - if ($folder['data_content']['topic_id'] === $topic_id) { - $ret[] = $folder; + if ($course_topic) { + $topic_folders = self::findBySQL( + "folder_type = 'CourseTopicFolder' AND range_id = ? AND range_type = 'course'", + [$course_topic->seminar_id] + ); + + foreach ($topic_folders as $folder) { + if ($folder['data_content']['topic_id'] === $topic_id) { + $ret[] = $folder; + } } } return $ret; @@ -218,15 +221,18 @@ class Folder extends SimpleORMap implements FeedbackRange */ public static function findByTermin_id($termin_id) { - $seminar_id = CourseDate::find($termin_id)->range_id; - $date_folders = self::findBySQL( - "folder_type = 'CourseDateFolder' AND range_id = ? AND range_type = 'course'", - [$seminar_id] - ); + $course_date = CourseDate::find($termin_id); $ret = []; - foreach ($date_folders as $key => $folder) { - if ($folder['data_content']['termin_id'] === $termin_id) { - $ret[] = $folder; + if ($course_date) { + $date_folders = self::findBySQL( + "folder_type = 'CourseDateFolder' AND range_id = ? AND range_type = 'course'", + [$course_date->range_id] + ); + + foreach ($date_folders as $folder) { + if ($folder['data_content']['termin_id'] === $termin_id) { + $ret[] = $folder; + } } } return $ret; |