upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-03-27 04:43:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 38

Merge pull request #41038 from nextcloud/fix-#41005-Resend-welcome-email

Browse source 
Fix: #41005 Resend welcome email
This commit is contained in:
John Molakvoæ 2024-02-23 23:59:47 +01:00 committed by GitHub
commit eef571e4fb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/provisioning_api/lib/Controller/UsersController.php
View file

@ -4,6 +4,7 @@ declare(strict_types=1);
/**
* @copyright Copyright (c) 2016, ownCloud, Inc.
* @copyright Copyright (c) 2023, Ezhil Shanmugham <ezhil930@gmail.com>
*
* @author Arthur Schiwon <blizzz@arthur-schiwon.de>
* @author Bjoern Schiessle <bjoern@schiessle.org>
@ -25,6 +26,7 @@ declare(strict_types=1);
* @author Tom Needham <tom@owncloud.com>
* @author Vincent Petry <vincent@nextcloud.com>
* @author Kate Döen <kate.doeen@nextcloud.com>
* @author Ezhil Shanmugham <ezhil930@gmail.com>
*
* @license AGPL-3.0
*
@ -1546,7 +1548,12 @@ class UsersController extends AUserData {
}
try {
$emailTemplate = $this->newUserMailHelper->generateTemplate($targetUser, false);
if ($this->config->getUserValue($targetUser->getUID(), 'core', 'lostpassword')) {
$emailTemplate = $this->newUserMailHelper->generateTemplate($targetUser, true);
} else {
$emailTemplate = $this->newUserMailHelper->generateTemplate($targetUser, false);
}
$this->newUserMailHelper->sendMail($targetUser, $emailTemplate);
} catch (\Exception $e) {
$this->logger->error(