diff options
| author | Jan-Hendrik Willms <tleilax+studip@gmail.com> | 2022-07-14 07:22:51 +0000 |
|---|---|---|
| committer | David Siegfried <david.siegfried@uni-vechta.de> | 2022-07-14 07:22:51 +0000 |
| commit | 60080354dcc904e01f4ee88793d0e132afca8227 (patch) | |
| tree | cfa130035184cb194f1e1f2a1f515c96ce60f9fe /lib/classes/UserManagement.class.php | |
| parent | 988123d8bf65657907cde0a522e5354b476212d8 (diff) | |
resurrect lost commit, fixes #1235
Closes #1235
Merge request studip/studip!806
Diffstat (limited to 'lib/classes/UserManagement.class.php')
| -rw-r--r-- | lib/classes/UserManagement.class.php | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/lib/classes/UserManagement.class.php b/lib/classes/UserManagement.class.php index 2dc1f59..17ce8a3 100644 --- a/lib/classes/UserManagement.class.php +++ b/lib/classes/UserManagement.class.php @@ -539,10 +539,12 @@ class UserManagement // include language-specific subject and mailbody $user_language = getUserLanguagePath($this->user_data['auth_user_md5.user_id']); $Zeit = strftime('%x, %X'); - include "locale/{$user_language}/LC_MAILS/change_mail.inc.php"; + + // TODO: This should be refactored so that the included file returns an array + include "locale/{$user_language}/LC_MAILS/change_mail.inc.php"; // Defines $subject and $mailbody // send mail - StudipMail::sendMessage($this->user_data['auth_user_md5.Email'], $subject, $mailbody); + StudipMail::sendMessage($this->user_data['auth_user_md5.Email'], $subject ?? '', $mailbody ?? ''); } // Upgrade to admin or root? if (in_array($newuser['auth_user_md5.perms'], ['admin', 'root'])) { @@ -999,7 +1001,7 @@ class UserManagement $this->user_data['auth_user_md5.user_id'] ]); if ($statement->rowCount() > 0) { - $msg .= 'info§' . _('Benutzername anonymisiert.') . '§'; + $this->msg .= 'info§' . _('Benutzername anonymisiert.') . '§'; } NotificationCenter::postNotification('UserDataDidRemove', $this->user_data['auth_user_md5.user_id'], 'names'); } @@ -1036,10 +1038,12 @@ class UserManagement if ($this->checkMail($this->user_data['auth_user_md5.Email'])) { // include language-specific subject and mailbody $Zeit = strftime('%x, %X'); - include "locale/$user_language/LC_MAILS/delete_mail.inc.php"; + + // TODO: This should be refactored so that the included file returns an array + include "locale/$user_language/LC_MAILS/delete_mail.inc.php"; // Defines $subject and $mailbody // send mail - StudipMail::sendMessage($this->user_data['auth_user_md5.Email'], $subject, $mailbody); + StudipMail::sendMessage($this->user_data['auth_user_md5.Email'], $subject ?? '', $mailbody ?? ''); } // Remove plugin associations/activations |