From a8e260a8dae506cd315977a2933f03669ad07dbb Mon Sep 17 00:00:00 2001
From: David Siegfried <david.siegfried@uni-vechta.de>
Date: Fri, 8 Sep 2023 08:29:02 +0000
Subject: [PATCH] fixes #3156
Closes #3156
Merge request studip/studip!2132
---
app/controllers/my_courses.php | 9 ++++++---
lib/messaging.inc.php | 3 ++-
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/app/controllers/my_courses.php b/app/controllers/my_courses.php
index 8216924637e..02e6ecafaa5 100644
--- a/app/controllers/my_courses.php
+++ b/app/controllers/my_courses.php
@@ -196,12 +196,12 @@ class MyCoursesController extends AuthenticatedController
$add_query = "LEFT JOIN seminar_user as su1 ON (su1.seminar_id=seminare.Seminar_id AND su1.status='dozent')";
} elseif ($group_field === 'mvv') {
$add_fields = ', mm.`modul_id` AS mvv';
- $add_query = "LEFT JOIN `mvv_lvgruppe_seminar` AS mls ON (mls.`seminar_id` = seminare.`Seminar_id`)
+ $add_query = "LEFT JOIN `mvv_lvgruppe_seminar` AS mls ON (mls.`seminar_id` = seminare.`Seminar_id`)
LEFT JOIN `mvv_lvgruppe` AS ml ON (mls.`lvgruppe_id` = ml.`lvgruppe_id`)
LEFT JOIN `mvv_lvgruppe_modulteil` AS mlm on(mls.`lvgruppe_id` = mlm.`lvgruppe_id`)
LEFT JOIN `mvv_modulteil` AS mmt ON (mlm.`modulteil_id` = mmt.`modulteil_id`)
LEFT JOIN `mvv_modul` AS mm ON (mmt.`modul_id` = mm.`modul_id`)";
-
+
}
$dbv = DbView::getView('sem_tree');
@@ -401,7 +401,10 @@ class MyCoursesController extends AuthenticatedController
// Ensure last teacher cannot leave course
$course = Course::find($course_id);
- if ($course->members->findOneBy('user_id', $GLOBALS['user']->id)->status === 'dozent'
+ $teacher = $course->members->findOneBy('user_id', User::findCurrent()->id);
+ if (
+ $teacher
+ && $teacher->status === 'dozent'
&& count($course->getMembersWithStatus('dozent')) === 1
) {
PageLayout::postError(sprintf(
diff --git a/lib/messaging.inc.php b/lib/messaging.inc.php
index ce194c375ce..035e78d37bd 100644
--- a/lib/messaging.inc.php
+++ b/lib/messaging.inc.php
@@ -161,7 +161,8 @@ class messaging
$msg = Message::find($message_id);
$receiver = User::find($rec_user_id);
$to = $receiver->Email;
-
+ $reply_to = '';
+ $snd_fullname = '';
// do not try to send mails to users without a mail address
if (!$to) {
return;
--
GitLab