sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Some psalm fixes in the settings app 

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
pull/25644/head
Roeland Jago Douma 2021-02-15 10:00:35 +07:00
parent 84de7a8d63
commit bd8b1786c5
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/settings/lib/Controller/HelpController.php
Unescape Escape View File

@ -73,7 +73,7 @@ class HelpController extends Controller {
public function help(string $mode = 'user'): TemplateResponse {
$this->navigationManager->setActiveEntry('help');
if (!isset($mode) || $mode !== 'admin') {
if ($mode !== 'admin') {
$mode = 'user';
}

11
apps/settings/lib/Mailer/NewUserMailHelper.php
Unescape Escape View File

@ -172,9 +172,16 @@ class NewUserMailHelper {
* @throws \Exception If mail could not be sent
*/
public function sendMail(IUser $user,
IEMailTemplate $emailTemplate) {
IEMailTemplate $emailTemplate): void {
// Be sure to never try to send to an empty e-mail
$email = $user->getEMailAddress();
if ($email === null) {
return;
}
$message = $this->mailer->createMessage();
$message->setTo([$user->getEMailAddress() => $user->getDisplayName()]);
$message->setTo([$email => $user->getDisplayName()]);
$message->setFrom([$this->fromAddress => $this->themingDefaults->getName()]);
$message->useTemplate($emailTemplate);
$this->mailer->send($message);