aboutsummaryrefslogtreecommitdiff
path: root/lib/models/CourseMember.class.php
diff options
context:
space:
mode:
authorJan-Hendrik Willms <tleilax+studip@gmail.com>2023-03-24 10:49:58 +0000
committerJan-Hendrik Willms <tleilax+studip@gmail.com>2023-03-24 10:49:58 +0000
commit0ec620a8b069cc72d0c65b8fa23aef8fea1d9fa5 (patch)
tree81cc0cd3da3030ea898561356e490501cdb3b615 /lib/models/CourseMember.class.php
parentd549af7e9e8cf5e44675eaf60485fc53c0b3e7f1 (diff)
use correct pk and remove handling for copying studycourse, adds migration to...
Closes #2441 Merge request studip/studip!1638
Diffstat (limited to 'lib/models/CourseMember.class.php')
-rw-r--r--lib/models/CourseMember.class.php6
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/models/CourseMember.class.php b/lib/models/CourseMember.class.php
index dc3a8fb..e905d4b 100644
--- a/lib/models/CourseMember.class.php
+++ b/lib/models/CourseMember.class.php
@@ -380,12 +380,8 @@ class CourseMember extends SimpleORMap implements PrivacyObject
$admission_comment = '';
$mkdate = time();
- $admission_user = AdmissionApplication::find([$seminar_id, $user_id]);
+ $admission_user = AdmissionApplication::find([$user_id, $seminar_id]);
if ($admission_user) {
- // copy the studycourse from admission_seminar_user
- if ($copy_studycourse && $admission_user->studiengang_id) {
- $contingent = $admission_user->studiengang_id;
- }
$admission_status = $admission_user->status;
$admission_comment = $admission_user->comment ?? '';
$mkdate = $admission_user->mkdate;