From 81de0b95112f39cb701224c069cffdc4a4ca3a25 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 | 5 ++++-
lib/messaging.inc.php | 3 ++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/app/controllers/my_courses.php b/app/controllers/my_courses.php
index c0dbeb3798a..6b1dae4dde9 100644
--- a/app/controllers/my_courses.php
+++ b/app/controllers/my_courses.php
@@ -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 b055c7f1a13..22b7c25ec69 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