summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2018-01-03 23:45:31 +0100
committerGitHub <noreply@github.com>2018-01-03 23:45:31 +0100
commit19280adc0d360e546d49e07bb4866e6e756fcbdb (patch)
tree171d4e9aed97debfe0072b5acfbd507dd7a99f9c /core
parent5011142024a2563ac162e17417dd9b7edcae0ff5 (diff)
parente9eccf34f9258a3720afb3cde218275f4b35f884 (diff)
downloadnextcloud-server-19280adc0d360e546d49e07bb4866e6e756fcbdb.tar.gz
nextcloud-server-19280adc0d360e546d49e07bb4866e6e756fcbdb.zip
Merge pull request #7611 from nextcloud/fix-7445
Don't attempt to translate login names to uids when uids are provided
Diffstat (limited to 'core')
-rw-r--r--core/Controller/LostController.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/core/Controller/LostController.php b/core/Controller/LostController.php
index befa1da6944..e7462180388 100644
--- a/core/Controller/LostController.php
+++ b/core/Controller/LostController.php
@@ -224,6 +224,12 @@ class LostController extends Controller {
return new JSONResponse($this->error($this->l10n->t('Password reset is disabled')));
}
+ \OCP\Util::emitHook(
+ '\OCA\Files_Sharing\API\Server2Server',
+ 'preLoginNameUsedAsUserName',
+ ['uid' => &$user]
+ );
+
// FIXME: use HTTP error codes
try {
$this->sendEmail($user);